2007-06-29 02:43:55

by Surya Prabhakar N

Subject: updated sbpcd.c

Hi emoenke,
Can this patch be verified and pulled into your tree.

thanks.
Surya.



From: Jesper Juhl <[email protected]>
To: Surya <[email protected]>
Cc: , Linux Kernel <[email protected]>,
[email protected]
Subject: Re: [PATCH]: check_region cleanup in sbpcd.c
Date: Tue, 26 Jun 2007 01:07:41 +0200

On 12/06/07, Surya <[email protected]> wrote:
[snip]
> >
> I am sending with all the corrections, if its ok to acknowledge it?
>
Looks good to me.

>
> Signed-off-by: Surya Prabhakar <[email protected]>
Reviewed-by: Jesper Juhl <[email protected]>



----snip------

Signed-off-by: Surya Prabhakar <[email protected]>
---

diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index a1283b1..5414172 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -358,6 +358,9 @@
* Add bio/kdev_t changes for 2.5.x required to make it work again.
* Still room for improvement in the request handling here if anyone
* actually cares. Bring your own chainsaw. Paul G. 02/2002
+ *
+ * Deprecated check_region cleanup to request_region
+ * -Surya Prabhakar N 08/07/2007
*/


@@ -555,6 +558,7 @@ static struct cdrom_read_audio read_audio;
static unsigned char msgnum;
static char msgbuf[80];

+static int addr[2] = {1, CDROM_PORT};
static int max_drives = MAX_DRIVES;
module_param(max_drives, int, 0);
#ifndef MODULE
@@ -5638,7 +5642,6 @@ int __init sbpcd_init(void)
#endif
{
int i=0, j=0;
- int addr[2]={1, CDROM_PORT};
int port_index;

sti();
@@ -5670,9 +5673,9 @@ int __init sbpcd_init(void)
{
addr[1]=sbpcd[port_index];
if (addr[1]==0) break;
- if (check_region(addr[1],4))
+ if (!request_region(addr[1],4, "sbpcd driver"))
{
- msg(DBG_INF,"check_region: %03X is not free.\n",addr[1]);
+ msg(DBG_INF,"request_region: %03X is not free.\n",addr[1]);
continue;
}
if (sbpcd[port_index+1]==2) type=str_sp;
@@ -5699,6 +5702,7 @@ int __init sbpcd_init(void)
if (ndrives==0)
{
msg(DBG_INF, "No drive found.\n");
+ release_region(addr[1],4);
#ifdef MODULE
return -EIO;
#else
@@ -5775,6 +5779,7 @@ int __init sbpcd_init(void)
if (!request_region(CDo_command,4,major_name))
{
printk(KERN_WARNING "sbpcd: Unable to request region 0x%x\n", CDo_command);
+ release_region(addr[1],4);
return -EIO;
}

@@ -5788,6 +5793,8 @@ int __init sbpcd_init(void)
#endif /* SOUND_BASE */

if (register_blkdev(MAJOR_NR, major_name)) {
+ release_region(CDo_command,4);
+ release_region(addr[1],4);
#ifdef MODULE
return -EIO;
#else
@@ -5801,6 +5808,7 @@ int __init sbpcd_init(void)
sbpcd_queue = blk_init_queue(do_sbpcd_request, &sbpcd_lock);
if (!sbpcd_queue) {
release_region(CDo_command,4);
+ release_region(addr[1],4);
unregister_blkdev(MAJOR_NR, major_name);
return -ENOMEM;
}
@@ -5834,6 +5842,7 @@ int __init sbpcd_init(void)
printk("Can't unregister %s\n", major_name);
}
release_region(CDo_command,4);
+ release_region(addr[1],4);
blk_cleanup_queue(sbpcd_queue);
return -EIO;
}
@@ -5850,6 +5859,7 @@ int __init sbpcd_init(void)
if (sbpcd_infop == NULL)
{
release_region(CDo_command,4);
+ release_region(addr[1],4);
blk_cleanup_queue(sbpcd_queue);
return -ENOMEM;
}
@@ -5894,6 +5904,7 @@ static void sbpcd_exit(void)
return;
}
release_region(CDo_command,4);
+ release_region(addr[1],4);
blk_cleanup_queue(sbpcd_queue);
for (j=0;j<NR_SBPCD;j++)
{

-surya.

2007-06-29 02:53:27

by Rene Herman

Subject: Re: updated sbpcd.c

On 06/29/2007 04:47 AM, Surya Prabhakar N wrote:

> Hi emoenke,
> Can this patch be verified and pulled into your tree.

You (and he) may not particularly care -- these old drivers are going to be
removed for 2.6.23: http://lkml.org/lkml/2007/6/21/34

Rene.

2007-06-29 06:32:27

by Eberhard Moenkeberg

Subject: Re: updated sbpcd.c

Hi,

On Fri, 29 Jun 2007, Surya Prabhakar N wrote:

>
> Hi emoenke,
> Can this patch be verified and pulled into your tree.
>
> thanks.
> Surya.

Jesper Juhl should ack it (if), and Jens Axboe would be the right person
to pull it into the tree.


Viele Gr??e
Eberhard M?nkeberg ([email protected], [email protected])

2007-06-29 09:14:18

by Jesper Juhl

Subject: Re: updated sbpcd.c

On 29/06/07, Eberhard Moenkeberg <[email protected]> wrote:
> Hi,
>
> On Fri, 29 Jun 2007, Surya Prabhakar N wrote:
>
> >
> > Hi emoenke,
> > Can this patch be verified and pulled into your tree.
> >
> > thanks.
> > Surya.
>
> Jesper Juhl should ack it (if), and Jens Axboe would be the right person
> to pull it into the tree.
>
Consider Surya's patch to be
Acked-by: Jesper Juhl <[email protected]>

--
Jesper Juhl <[email protected]>
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please http://www.expita.com/nomime.html