Re: [2.6 patch] fix a drivers/char/isicom.c compile warning

[Adrian Bunk <bunk@fs.tum.de>]

On Mon, Jan 12, 2004 at 10:17:46PM -0200, Arnaldo Carvalho de Melo wrote:
> Em Tue, Jan 13, 2004 at 01:00:56AM +0100, Adrian Bunk escreveu:
>...
> > The following patch fixes this issue:
> > 
> > 
> > --- linux-2.6.1-mm2-modular-no-smp/drivers/char/isicom.c.old	2004-01-13 00:40:02.000000000 +0100
> > +++ linux-2.6.1-mm2-modular-no-smp/drivers/char/isicom.c	2004-01-13 00:49:00.000000000 +0100
> > @@ -1675,7 +1675,7 @@
> >  static void unregister_drivers(void)
> >  {
> >  	int error;
> > -	if (tty_unregister_driver(isicom_normal))
> > +	if ((error=tty_unregister_driver(isicom_normal)))
> >  		printk(KERN_DEBUG "ISICOM: couldn't unregister normal driver error=%d.\n",error);
> 
> OK, the patch is right, but couldn't we take the opportunity to make this
> more readable while at it? Ssomething like:
> 
> static void unregister_drivers(void)
> {
>         int error = tty_unregister_driver(isicom_normal);
> 
>         if (error)
> 		printk(KERN_DEBUG "ISICOM: couldn't unregister normal "
> 				  "driver error=%d.\n", error);
> 
> ? :-)

I thought about it, but I wasn't sure whether changing a driver to be 
more readable in _one_ place and making the code there different from 
the coding style used in the rest of the driver is really an 
improvement (and no, I don't want to clean the whole driver...)?

> - Arnaldo

cu
Adrian

--- linux-2.6.1-mm2-modular-no-smp/drivers/char/isicom.c.old	2004-01-13 00:40:02.000000000 +0100
+++ linux-2.6.1-mm2-modular-no-smp/drivers/char/isicom.c	2004-01-13 01:21:15.000000000 +0100
@@ -1674,9 +1674,11 @@
 
 static void unregister_drivers(void)
 {
-	int error;
-	if (tty_unregister_driver(isicom_normal))
+	int error = tty_unregister_driver(isicom_normal);
+
+	if (error)
 		printk(KERN_DEBUG "ISICOM: couldn't unregister normal driver error=%d.\n",error);
+
 	put_tty_driver(isicom_normal);
 }