#ifdef cleanup for drivers/net/fc/iph5526.c (240-test12-pre3)
Hi.
I recently investigated an 'unused function' warning in iph5526.c. Looking at it (both the code causing the warning and the whole driver) convinced me that the driver cannot be used without PCI enabled.
I therefore propose that we add a dependency in net/Config.in for this driver and clean the driver itself of #ifdef CONFIG_PCI stuff. The patch below does this and additionally some trivial code reordering to elininate some further #ifdefs.
Please comment.
drivers/net/fc/iph5526.c +5 -15
@@ -220,32 +220,23 @@static void iph5526_timeout (struct net_device *dev); -#ifdef CONFIG_PCI static int iph5526_probe_pci (struct net_device *dev); -#endif -int __init iph5526_probe (struct net_device *dev) { -#ifdef CONFIG_PCI if (pci_present () && (iph5526_probe_pci (dev) ==0 ))return 0 ; -#endif return -ENODEV ; } -#ifdef CONFIG_PCI static int __init iph5526_probe_pci (struct net_device *dev) { -#ifndef MODULE -struct fc_info *fi; -static int count =0 ; -#endif #ifdef MODULE -struct fc_info *fi = (struct fc_info *)dev->priv; -#endif - -#ifndef MODULE +struct fc_info *fi = (struct fc_info *)dev->priv; +#else +struct fc_info *fi; +static int count =0 ; +if (fc[count] !=NULL ) {if (dev ==NULL ) { dev =init_fcdev (NULL ,0 );
@@ -277,7 +268,6 @@display_cache (fi);return 0 ; } -#endif /* CONFIG_PCI */ static int __init fcdev_init (struct net_device *dev) {
drivers/net/Config.in +1 -1
@@ -258,7 +258,7 @@ bool 'Fibre Channel driver support' CONFIG_NET_FC if [ "$CONFIG_NET_FC" = "y" ]; then - dep_tristate ' Interphase 5526 Tachyon chipset based adapter support' CONFIG_IPHASE5526 $CONFIG_SCSI + dep_tristate ' Interphase 5526 Tachyon chipset based adapter support' CONFIG_IPHASE5526 $CONFIG_SCSI $CONFIG_PCI fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
Signature · 9 lines
Regards,
Rasmus([email protected])
"The glass is not half full, nor half empty. The glass is just too big."
--Anonymous
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/