Commit 8cb9cb29 authored by Anders Gustafsson's avatar Anders Gustafsson Committed by Jeff Garzik

Renames struct bus_type to struct de4x5_bus_type in de4x5 net driver,

to avoid collision with the struct bus_type in device.h
parent 4d7466b2
...@@ -866,7 +866,7 @@ struct de4x5_private { ...@@ -866,7 +866,7 @@ struct de4x5_private {
** offsets in the PCI and EISA boards. Also note that the ethernet address ** offsets in the PCI and EISA boards. Also note that the ethernet address
** PROM is accessed differently. ** PROM is accessed differently.
*/ */
static struct bus_type { static struct de4x5_bus_type {
int bus; int bus;
int bus_num; int bus_num;
int device; int device;
...@@ -967,10 +967,10 @@ static void reset_init_sia(struct net_device *dev, s32 sicr, s32 strr, s32 si ...@@ -967,10 +967,10 @@ static void reset_init_sia(struct net_device *dev, s32 sicr, s32 strr, s32 si
static int test_ans(struct net_device *dev, s32 irqs, s32 irq_mask, s32 msec); static int test_ans(struct net_device *dev, s32 irqs, s32 irq_mask, s32 msec);
static int test_tp(struct net_device *dev, s32 msec); static int test_tp(struct net_device *dev, s32 msec);
static int EISA_signature(char *name, s32 eisa_id); static int EISA_signature(char *name, s32 eisa_id);
static int PCI_signature(char *name, struct bus_type *lp); static int PCI_signature(char *name, struct de4x5_bus_type *lp);
static void DevicePresent(u_long iobase); static void DevicePresent(u_long iobase);
static void enet_addr_rst(u_long aprom_addr); static void enet_addr_rst(u_long aprom_addr);
static int de4x5_bad_srom(struct bus_type *lp); static int de4x5_bad_srom(struct de4x5_bus_type *lp);
static short srom_rd(u_long address, u_char offset); static short srom_rd(u_long address, u_char offset);
static void srom_latch(u_int command, u_long address); static void srom_latch(u_int command, u_long address);
static void srom_command(u_int command, u_long address); static void srom_command(u_int command, u_long address);
...@@ -998,7 +998,7 @@ static void SetMulticastFilter(struct net_device *dev); ...@@ -998,7 +998,7 @@ static void SetMulticastFilter(struct net_device *dev);
static int get_hw_addr(struct net_device *dev); static int get_hw_addr(struct net_device *dev);
static void srom_repair(struct net_device *dev, int card); static void srom_repair(struct net_device *dev, int card);
static int test_bad_enet(struct net_device *dev, int status); static int test_bad_enet(struct net_device *dev, int status);
static int an_exception(struct bus_type *lp); static int an_exception(struct de4x5_bus_type *lp);
#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__) #if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
static void eisa_probe(struct net_device *dev, u_long iobase); static void eisa_probe(struct net_device *dev, u_long iobase);
#endif #endif
...@@ -1143,7 +1143,7 @@ de4x5_probe(struct net_device *dev) ...@@ -1143,7 +1143,7 @@ de4x5_probe(struct net_device *dev)
static int __init static int __init
de4x5_hw_init(struct net_device *dev, u_long iobase, struct pci_dev *pdev) de4x5_hw_init(struct net_device *dev, u_long iobase, struct pci_dev *pdev)
{ {
struct bus_type *lp = &bus; struct de4x5_bus_type *lp = &bus;
int i, status=0; int i, status=0;
char *tmp; char *tmp;
...@@ -2105,7 +2105,7 @@ eisa_probe(struct net_device *dev, u_long ioaddr) ...@@ -2105,7 +2105,7 @@ eisa_probe(struct net_device *dev, u_long ioaddr)
u_short vendor; u_short vendor;
u32 cfid; u32 cfid;
u_long iobase; u_long iobase;
struct bus_type *lp = &bus; struct de4x5_bus_type *lp = &bus;
char name[DE4X5_STRLEN]; char name[DE4X5_STRLEN];
if (lastEISA == MAX_EISA_SLOTS) return;/* No more EISA devices to search */ if (lastEISA == MAX_EISA_SLOTS) return;/* No more EISA devices to search */
...@@ -2186,7 +2186,7 @@ pci_probe(struct net_device *dev, u_long ioaddr) ...@@ -2186,7 +2186,7 @@ pci_probe(struct net_device *dev, u_long ioaddr)
u_short vendor, index, status; u_short vendor, index, status;
u_int irq = 0, device, class = DE4X5_CLASS_CODE; u_int irq = 0, device, class = DE4X5_CLASS_CODE;
u_long iobase = 0; /* Clear upper 32 bits in Alphas */ u_long iobase = 0; /* Clear upper 32 bits in Alphas */
struct bus_type *lp = &bus; struct de4x5_bus_type *lp = &bus;
if (lastPCI == NO_MORE_PCI) return; if (lastPCI == NO_MORE_PCI) return;
...@@ -2299,7 +2299,7 @@ srom_search(struct pci_dev *dev) ...@@ -2299,7 +2299,7 @@ srom_search(struct pci_dev *dev)
u_int irq = 0, device; u_int irq = 0, device;
u_long iobase = 0; /* Clear upper 32 bits in Alphas */ u_long iobase = 0; /* Clear upper 32 bits in Alphas */
int i, j; int i, j;
struct bus_type *lp = &bus; struct de4x5_bus_type *lp = &bus;
struct list_head *walk = &dev->bus_list; struct list_head *walk = &dev->bus_list;
for (walk = walk->next; walk != &dev->bus_list; walk = walk->next) { for (walk = walk->next; walk != &dev->bus_list; walk = walk->next) {
...@@ -3992,7 +3992,7 @@ EISA_signature(char *name, s32 eisa_id) ...@@ -3992,7 +3992,7 @@ EISA_signature(char *name, s32 eisa_id)
** Look for a particular board name in the PCI configuration space ** Look for a particular board name in the PCI configuration space
*/ */
static int static int
PCI_signature(char *name, struct bus_type *lp) PCI_signature(char *name, struct de4x5_bus_type *lp)
{ {
static c_char *de4x5_signatures[] = DE4X5_SIGNATURE; static c_char *de4x5_signatures[] = DE4X5_SIGNATURE;
int i, status = 0, siglen = sizeof(de4x5_signatures)/sizeof(c_char *); int i, status = 0, siglen = sizeof(de4x5_signatures)/sizeof(c_char *);
...@@ -4041,7 +4041,7 @@ static void ...@@ -4041,7 +4041,7 @@ static void
DevicePresent(u_long aprom_addr) DevicePresent(u_long aprom_addr)
{ {
int i, j=0; int i, j=0;
struct bus_type *lp = &bus; struct de4x5_bus_type *lp = &bus;
if (lp->chipset == DC21040) { if (lp->chipset == DC21040) {
if (lp->bus == EISA) { if (lp->bus == EISA) {
...@@ -4122,7 +4122,7 @@ get_hw_addr(struct net_device *dev) ...@@ -4122,7 +4122,7 @@ get_hw_addr(struct net_device *dev)
u_long iobase = dev->base_addr; u_long iobase = dev->base_addr;
int broken, i, k, tmp, status = 0; int broken, i, k, tmp, status = 0;
u_short j,chksum; u_short j,chksum;
struct bus_type *lp = &bus; struct de4x5_bus_type *lp = &bus;
broken = de4x5_bad_srom(lp); broken = de4x5_bad_srom(lp);
...@@ -4203,7 +4203,7 @@ get_hw_addr(struct net_device *dev) ...@@ -4203,7 +4203,7 @@ get_hw_addr(struct net_device *dev)
** didn't seem to work here...? ** didn't seem to work here...?
*/ */
static int static int
de4x5_bad_srom(struct bus_type *lp) de4x5_bad_srom(struct de4x5_bus_type *lp)
{ {
int i, status = 0; int i, status = 0;
...@@ -4237,7 +4237,7 @@ de4x5_strncmp(char *a, char *b, int n) ...@@ -4237,7 +4237,7 @@ de4x5_strncmp(char *a, char *b, int n)
static void static void
srom_repair(struct net_device *dev, int card) srom_repair(struct net_device *dev, int card)
{ {
struct bus_type *lp = &bus; struct de4x5_bus_type *lp = &bus;
switch(card) { switch(card) {
case SMC: case SMC:
...@@ -4258,7 +4258,7 @@ srom_repair(struct net_device *dev, int card) ...@@ -4258,7 +4258,7 @@ srom_repair(struct net_device *dev, int card)
static int static int
test_bad_enet(struct net_device *dev, int status) test_bad_enet(struct net_device *dev, int status)
{ {
struct bus_type *lp = &bus; struct de4x5_bus_type *lp = &bus;
int i, tmp; int i, tmp;
for (tmp=0,i=0; i<ETH_ALEN; i++) tmp += (u_char)dev->dev_addr[i]; for (tmp=0,i=0; i<ETH_ALEN; i++) tmp += (u_char)dev->dev_addr[i];
...@@ -4291,7 +4291,7 @@ test_bad_enet(struct net_device *dev, int status) ...@@ -4291,7 +4291,7 @@ test_bad_enet(struct net_device *dev, int status)
** List of board exceptions with correctly wired IRQs ** List of board exceptions with correctly wired IRQs
*/ */
static int static int
an_exception(struct bus_type *lp) an_exception(struct de4x5_bus_type *lp)
{ {
if ((*(u_short *)lp->srom.sub_vendor_id == 0x00c0) && if ((*(u_short *)lp->srom.sub_vendor_id == 0x00c0) &&
(*(u_short *)lp->srom.sub_system_id == 0x95e0)) { (*(u_short *)lp->srom.sub_system_id == 0x95e0)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment