From 030fd2d8e3faf43de51b93117a609a0da57aa4a0 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sun, 17 Aug 2003 04:17:28 -0400 Subject: [PATCH] [netdrvr] clean up driver object name removal breakage Affected drivers: atmel_cs, olympic, 3c359 --- drivers/net/tokenring/3c359.c | 2 +- drivers/net/tokenring/olympic.c | 3 ++- drivers/net/wireless/atmel_cs.c | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index c776edbbf8045..d8a95b47bcf99 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c @@ -315,7 +315,7 @@ int __devinit xl_probe(struct pci_dev *pdev, const struct pci_device_id *ent) dev->irq=pdev->irq; dev->base_addr=pci_resource_start(pdev,0) ; dev->init=NULL ; /* Must be null with new api, otherwise get called twice */ - xl_priv->xl_card_name = (char *)pdev->dev.name ; + xl_priv->xl_card_name = pci_name(pdev); xl_priv->xl_mmio=ioremap(pci_resource_start(pdev,1), XL_IO_SPACE); xl_priv->pdev = pdev ; diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index 89dffdc20c001..eeb044914022f 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c @@ -230,9 +230,10 @@ static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device dev->irq=pdev->irq; dev->base_addr=pci_resource_start(pdev, 0); dev->init=NULL; /* Must be NULL otherwise we get called twice */ - olympic_priv->olympic_card_name = (char *)pdev->dev.name ; + olympic_priv->olympic_card_name = pci_name(pdev); olympic_priv->olympic_mmio = ioremap(pci_resource_start(pdev,1),256); olympic_priv->olympic_lap = ioremap(pci_resource_start(pdev,2),2048); +#warning check ioremap return value olympic_priv->pdev = pdev ; if ((pkt_buf_sz[card_no] < 100) || (pkt_buf_sz[card_no] > 18000) ) diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index b245484f17f76..c0694460f0eb5 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c @@ -379,7 +379,6 @@ static struct { /* This is strictly temporary, until PCMCIA devices get integrated into the device model. */ static struct device atmel_device = { - .name = "Atmel at76c50x wireless", .bus_id = "pcmcia", }; -- 2.53.0