Messages in this thread | | | Subject | Re: [PATCH] ip2: Remove #ifdef MODULE from ip2main.c | From | "Michael H. Warfield" <> | Date | Tue, 01 Dec 2009 10:00:14 -0500 |
| |
[Crud... NOW I find out that I've been dumped from all the Vger mailing lists... Again... Sigh...]
Looks good to me.
Regards, Mike
Signed-off-by: Michael H. Warfield <mhw@WittsEnd.com>
On Tue, 2009-12-01 at 15:02 +0600, Rakib Mullick wrote: > ip2: Remove #ifdef MODULE completely. > > From kernel command line we can pass "module parameters". > So #ifdef MODULE is obsolute now. Remove it completely. > When CONFIG_PCI=n and building ip2main.c then we are hit > by the following warning. So move *pdev into #ifdef CONFIG_PCI. > > drivers/char/ip2/ip2main.c: In function `ip2_loadmain': > drivers/char/ip2/ip2main.c:542: warning: unused variable `pdev' > > Signed-off-by: Rakib Mullick <rakib.mullick@gmail.com> > --- > > --- linus/drivers/char/ip2/ip2main.c 2009-12-01 12:41:53.000000000 +0600 > +++ rakib/drivers/char/ip2/ip2main.c 2009-12-01 12:56:56.000000000 +0600 > @@ -263,7 +263,7 @@ static int tracewrap; > /* Macros */ > /**********/ > > -#if defined(MODULE) && defined(IP2DEBUG_OPEN) > +#ifdef IP2DEBUG_OPEN > #define DBG_CNT(s) printk(KERN_DEBUG "(%s): [%x] ttyc=%d, modc=%x -> %s\n", \ > tty->name,(pCh->flags), \ > tty->count,/*GET_USE_COUNT(module)*/0,s) > @@ -487,7 +487,6 @@ static const struct firmware *ip2_reques > return fw; > } > > -#ifndef MODULE > /****************************************************************************** > * ip2_setup: > * str: kernel command line string > @@ -531,7 +530,6 @@ static int __init ip2_setup(char *str) > return 1; > } > __setup("ip2=", ip2_setup); > -#endif /* !MODULE */ > > static int __init ip2_loadmain(void) > { > @@ -539,7 +537,6 @@ static int __init ip2_loadmain(void) > int err = 0; > i2eBordStrPtr pB = NULL; > int rc = -1; > - struct pci_dev *pdev = NULL; > const struct firmware *fw = NULL; > > if (poll_only) { > @@ -612,6 +609,7 @@ static int __init ip2_loadmain(void) > case PCI: > #ifdef CONFIG_PCI > { > + struct pci_dev *pdev = NULL; > u32 addr; > int status;
-- Michael H. Warfield (AI4NB) | (770) 985-6132 | mhw@WittsEnd.com /\/\|=mhw=|\/\/ | (678) 463-0932 | http://www.wittsend.com/mhw/ NIC whois: MHW9 | An optimist believes we live in the best of all PGP Key: 0x674627FF | possible worlds. A pessimist is sure of it! [unhandled content-type:application/pgp-signature] | |