Commit 46009c8b authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[netdrvr] minor cleanups in Becker-derived drivers 



- fealnx: convert #define to enum
- fealnx, sundance: mark chip info table __devinitdata
- fealnx: use dev_printk() during probe
- fealnx: formatting cleanups
- starfire: remove obsolete comment
- sundance, via-rhine: add some whitespace where useful, in tables
- sundance: prefer "{ }" table terminator
- via-rhine: mark PCI probe table const

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 8ab6f3f7

drivers/net/fealnx.c

+8 −5
Original line number Diff line number Diff line
@@ -124,7 +124,9 @@ MODULE_PARM_DESC(multicast_filter_limit, "fealnx maximum number of filtered mult 
MODULE_PARM_DESC(options, "fealnx: Bits 0-3: media type, bit 17: full duplex");

MODULE_PARM_DESC(full_duplex, "fealnx full duplex setting(s) (1)");



#define MIN_REGION_SIZE 136

enum {

	MIN_REGION_SIZE		= 136,

};



/* A chip capabilities table, matching the entries in pci_tbl[] above. */

enum chip_capability_flags {
@@ -149,7 +151,7 @@ struct chip_info { 
	int flags;

};



static const struct chip_info skel_netdrv_tbl[] = {

static const struct chip_info skel_netdrv_tbl[] __devinitdata = {

 	{ "100/10M Ethernet PCI Adapter",	HAS_MII_XCVR },

	{ "100/10M Ethernet PCI Adapter",	HAS_CHIP_XCVR },

	{ "1000/100/10M Ethernet PCI Adapter",	HAS_MII_XCVR },
@@ -503,13 +505,14 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, 
	

	len = pci_resource_len(pdev, bar);

	if (len < MIN_REGION_SIZE) {

		printk(KERN_ERR "%s: region size %ld too small, aborting\n",

		       boardname, len);

		dev_printk(KERN_ERR, &pdev->dev,

			   "region size %ld too small, aborting\n", len);

		return -ENODEV;

	}



	i = pci_request_regions(pdev, boardname);

	if (i) return i;

	if (i)

		return i;

	

	irq = pdev->irq;

drivers/net/starfire.c

+0 −1
Original line number Diff line number Diff line
@@ -730,7 +730,6 @@ static int __devinit starfire_init_one(struct pci_dev *pdev, 
		goto err_out_free_netdev;

	}



	/* ioremap is borken in Linux-2.2.x/sparc64 */

	base = ioremap(ioaddr, io_size);

	if (!base) {

		printk(KERN_ERR DRV_NAME " %d: cannot remap %#x @ %#lx, aborting\n",

drivers/net/sundance.c

+11 −11
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ IVc. Errata 
#define USE_IO_OPS 1

#endif



static struct pci_device_id sundance_pci_tbl[] = {

static const struct pci_device_id sundance_pci_tbl[] = {

	{ 0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0 },

	{ 0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1 },

	{ 0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2 },
@@ -212,7 +212,7 @@ static struct pci_device_id sundance_pci_tbl[] = { 
	{ 0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },

	{ 0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },

	{ 0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },

	{0,}

	{ }

};

MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);
@@ -223,7 +223,7 @@ enum { 
struct pci_id_info {

        const char *name;

};

static const struct pci_id_info pci_id_tbl[] = {

static const struct pci_id_info pci_id_tbl[] __devinitdata = {

	{"D-Link DFE-550TX FAST Ethernet Adapter"},

	{"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},

	{"D-Link DFE-580TX 4 port Server Adapter"},
@@ -231,7 +231,7 @@ static const struct pci_id_info pci_id_tbl[] = { 
	{"D-Link DL10050-based FAST Ethernet Adapter"},

	{"Sundance Technology Alta"},

	{"IC Plus Corporation IP100A FAST Ethernet Adapter"},

	{NULL,},			/* 0 terminated list. */

	{ }	/* terminate list. */

};



/* This driver was written to use PCI memory space, however x86-oriented

drivers/net/via-rhine.c

+5 −6
Original line number Diff line number Diff line
@@ -252,12 +252,11 @@ enum rhine_quirks { 
/* Beware of PCI posted writes */

#define IOSYNC	do { ioread8(ioaddr + StationAddr); } while (0)



static struct pci_device_id rhine_pci_tbl[] =

{

	{0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT86C100A */

	{0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT6102 */

	{0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* 6105{,L,LOM} */

	{0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT6105M */

static const struct pci_device_id rhine_pci_tbl[] = {

	{ 0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, },	/* VT86C100A */

	{ 0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, },	/* VT6102 */

	{ 0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, },	/* 6105{,L,LOM} */

	{ 0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, },	/* VT6105M */

	{ }	/* terminate list */

};

MODULE_DEVICE_TABLE(pci, rhine_pci_tbl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE