Commit 90e34891 authored by William Stinson's avatar William Stinson Committed by Linus Torvalds

[PATCH] remove check_region from Documentation_DocBook_videobook.tmpl

  This patch for Documentation/DocBook/videobook.tmpl removes two
  references check_region in the documentation using request_region
  instead.

  This patch removes all references to check_region in videobook.tmpl

  This is patch number 29 in a series of check_region patches I am doing as
  part of the kernel janitors project.
parent c474215e
...@@ -146,16 +146,17 @@ static int io = 0x320; ...@@ -146,16 +146,17 @@ static int io = 0x320;
int __init myradio_init(struct video_init *v) int __init myradio_init(struct video_init *v)
{ {
if(check_region(io, MY_IO_SIZE)) if(!request_region(io, MY_IO_SIZE, "myradio"))
{ {
printk(KERN_ERR printk(KERN_ERR
"myradio: port 0x%03X is in use.\n", io); "myradio: port 0x%03X is in use.\n", io);
return -EBUSY; return -EBUSY;
} }
if(video_device_register(&my_radio, VFL_TYPE_RADIO)==-1) if(video_device_register(&my_radio, VFL_TYPE_RADIO)==-1) {
release_region(io, MY_IO_SIZE);
return -EINVAL; return -EINVAL;
request_region(io, MY_IO_SIZE, "myradio"); }
return 0; return 0;
} }
...@@ -920,7 +921,7 @@ static int irq = 11; ...@@ -920,7 +921,7 @@ static int irq = 11;
int __init mycamera_init(struct video_init *v) int __init mycamera_init(struct video_init *v)
{ {
if(check_region(io, MY_IO_SIZE)) if(!request_region(io, MY_IO_SIZE, "mycamera"))
{ {
printk(KERN_ERR printk(KERN_ERR
"mycamera: port 0x%03X is in use.\n", io); "mycamera: port 0x%03X is in use.\n", io);
...@@ -928,9 +929,10 @@ int __init mycamera_init(struct video_init *v) ...@@ -928,9 +929,10 @@ int __init mycamera_init(struct video_init *v)
} }
if(video_device_register(&my_camera, if(video_device_register(&my_camera,
VFL_TYPE_GRABBER)==-1) VFL_TYPE_GRABBER)==-1) {
release_region(io, MY_IO_SIZE);
return -EINVAL; return -EINVAL;
request_region(io, MY_IO_SIZE, "mycamera"); }
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment