Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 747a1127 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

net: hp100: remove unnecessary #ifdefs 



Building the hp100 ethernet driver causes warnings when both the PCI
and EISA drivers are disabled:

ethernet/hp/hp100.c: In function 'hp100_module_init':
ethernet/hp/hp100.c:3047:2: warning: label 'out3' defined but not used [-Wunused-label]
ethernet/hp/hp100.c: At top level:
ethernet/hp/hp100.c:2828:13: warning: 'cleanup_dev' defined but not used [-Wunused-function]

We can easily avoid the warnings and make the driver look slightly
nicer by removing the #ifdefs that check for the CONFIG_PCI and
CONFIG_EISA, as all the registration functions are designed to
have no effect when the buses are disabled.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84092996

drivers/net/ethernet/hp/hp100.c

+0 −18
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ static const char *hp100_isa_tbl[] = { 
};

#endif



#ifdef CONFIG_EISA

static struct eisa_device_id hp100_eisa_tbl[] = {

	{ "HWPF180" }, /* HP J2577 rev A */

	{ "HWP1920" }, /* HP 27248B */
@@ -205,9 +204,7 @@ static struct eisa_device_id hp100_eisa_tbl[] = { 
	{ "" }	       /* Mandatory final entry ! */

};

MODULE_DEVICE_TABLE(eisa, hp100_eisa_tbl);

#endif



#ifdef CONFIG_PCI

static const struct pci_device_id hp100_pci_tbl[] = {

	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585A, PCI_ANY_ID, PCI_ANY_ID,},

	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585B, PCI_ANY_ID, PCI_ANY_ID,},
@@ -219,7 +216,6 @@ static const struct pci_device_id hp100_pci_tbl[] = { 
	{}			/* Terminating entry */

};

MODULE_DEVICE_TABLE(pci, hp100_pci_tbl);

#endif



static int hp100_rx_ratio = HP100_DEFAULT_RX_RATIO;

static int hp100_priority_tx = HP100_DEFAULT_PRIORITY_TX;
@@ -2842,7 +2838,6 @@ static void cleanup_dev(struct net_device *d) 
	free_netdev(d);

}



#ifdef CONFIG_EISA

static int hp100_eisa_probe(struct device *gendev)

{

	struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
@@ -2884,9 +2879,7 @@ static struct eisa_driver hp100_eisa_driver = { 
		.remove  = hp100_eisa_remove,

        }

};

#endif



#ifdef CONFIG_PCI

static int hp100_pci_probe(struct pci_dev *pdev,

			   const struct pci_device_id *ent)

{
@@ -2955,7 +2948,6 @@ static struct pci_driver hp100_pci_driver = { 
	.probe		= hp100_pci_probe,

	.remove		= hp100_pci_remove,

};

#endif



/*

 *  module section
@@ -3032,23 +3024,17 @@ static int __init hp100_module_init(void) 
	err = hp100_isa_init();

	if (err && err != -ENODEV)

		goto out;

#ifdef CONFIG_EISA

	err = eisa_driver_register(&hp100_eisa_driver);

	if (err && err != -ENODEV)

		goto out2;

#endif

#ifdef CONFIG_PCI

	err = pci_register_driver(&hp100_pci_driver);

	if (err && err != -ENODEV)

		goto out3;

#endif

 out:

	return err;

 out3:

#ifdef CONFIG_EISA

	eisa_driver_unregister (&hp100_eisa_driver);

 out2:

#endif

	hp100_isa_cleanup();

	goto out;

}
@@ -3057,12 +3043,8 @@ static int __init hp100_module_init(void) 
static void __exit hp100_module_exit(void)

{

	hp100_isa_cleanup();

#ifdef CONFIG_EISA

	eisa_driver_unregister (&hp100_eisa_driver);

#endif

#ifdef CONFIG_PCI

	pci_unregister_driver (&hp100_pci_driver);

#endif

}



module_init(hp100_module_init)