lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[netdrvr] natsemi: minor cleanups

Browse Source 
* make eeprom size a variable, prepping for future patch
* eliminate unused PCI_xxx stuff left over from Becker driver template
* convert a few #defines to enum
* mark PCI table const, __devinitdata
* don't bother with named constant for PCI device id

Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Jeff Garzik
2006-06-26 22:48:38 -04:00
parent 5a40f09baa
commit a2b524b2ec
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/natsemi.c
View File

@@ -226,7 +226,6 @@ static int full_duplex[MAX_UNITS];
NATSEMI_PG1_NREGS) NATSEMI_PG1_NREGS)
#define NATSEMI_REGS_VER 1 /* v1 added RFDR registers */ #define NATSEMI_REGS_VER 1 /* v1 added RFDR registers */
#define NATSEMI_REGS_SIZE (NATSEMI_NREGS * sizeof(u32)) #define NATSEMI_REGS_SIZE (NATSEMI_NREGS * sizeof(u32))
#define NATSEMI_DEF_EEPROM_SIZE 24 /* 12 16-bit values */
/* Buffer sizes: /* Buffer sizes:
* The nic writes 32-bit values, even if the upper bytes of * The nic writes 32-bit values, even if the upper bytes of
@@ -344,18 +343,6 @@ None characterised.
enum pcistuff {
PCI_USES_IO = 0x01,
PCI_USES_MEM = 0x02,
PCI_USES_MASTER = 0x04,
PCI_ADDR0 = 0x08,
PCI_ADDR1 = 0x10,
};
/* MMIO operations required */
#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_MEM | PCI_ADDR1)
/* /*
* Support for fibre connections on Am79C874: * Support for fibre connections on Am79C874:
* This phy needs a special setup when connected to a fibre cable. * This phy needs a special setup when connected to a fibre cable.
@@ -363,22 +350,25 @@ enum pcistuff {
*/ */
#define PHYID_AM79C874 0x0022561b #define PHYID_AM79C874 0x0022561b
#define MII_MCTRL 0x15 /* mode control register */ enum {
#define MII_FX_SEL 0x0001 /* 100BASE-FX (fiber) */ MII_MCTRL = 0x15, /* mode control register */
#define MII_EN_SCRM 0x0004 /* enable scrambler (tp) */ MII_FX_SEL = 0x0001, /* 100BASE-FX (fiber) */
MII_EN_SCRM = 0x0004, /* enable scrambler (tp) */
};
/* array of board data directly indexed by pci_tbl[x].driver_data */ /* array of board data directly indexed by pci_tbl[x].driver_data */
static const struct { static const struct {
const char *name; const char *name;
unsigned long flags; unsigned long flags;
unsigned int eeprom_size;
} natsemi_pci_info[] __devinitdata = { } natsemi_pci_info[] __devinitdata = {
{ "NatSemi DP8381[56]", PCI_IOTYPE }, { "NatSemi DP8381[56]", 0, 24 },
}; };
static struct pci_device_id natsemi_pci_tbl[] = { static const struct pci_device_id natsemi_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_83815, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0, }, { } /* terminate list */
}; };
MODULE_DEVICE_TABLE(pci, natsemi_pci_tbl); MODULE_DEVICE_TABLE(pci, natsemi_pci_tbl);
@@ -888,8 +878,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
iosize = pci_resource_len(pdev, pcibar); iosize = pci_resource_len(pdev, pcibar);
irq = pdev->irq; irq = pdev->irq;
if (natsemi_pci_info[chip_idx].flags & PCI_USES_MASTER) pci_set_master(pdev);
pci_set_master(pdev);
dev = alloc_etherdev(sizeof (struct netdev_private)); dev = alloc_etherdev(sizeof (struct netdev_private));
if (!dev) if (!dev)
@@ -928,7 +917,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
np->msg_enable = (debug >= 0) ? (1<<debug)-1 : NATSEMI_DEF_MSG; np->msg_enable = (debug >= 0) ? (1<<debug)-1 : NATSEMI_DEF_MSG;
np->hands_off = 0; np->hands_off = 0;
np->intr_status = 0; np->intr_status = 0;
np->eeprom_size = NATSEMI_DEF_EEPROM_SIZE; np->eeprom_size = natsemi_pci_info[chip_idx].eeprom_size;
/* Initial port: /* Initial port:
* - If the nic was configured to use an external phy and if find_mii * - If the nic was configured to use an external phy and if find_mii