[netdrvr] clean up driver object name removal breakage

Affected drivers: atmel_cs, olympic, 3c359

diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index c776edbbf8045e9ba96a4f2b5b395a30a1d62d9c..d8a95b47bcf99a1f0a595aa8d8f85a5be03382fe 100644 (file)
--- 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 89dffdc20c0015af6ce264a58bf68ff8aa4d4534..eeb044914022fc396dbfcc29ef0a8e7fe4173216 100644 (file)
--- 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 b245484f17f7673d13f1a359f14618870532885d..c0694460f0eb529eeb21adba635fcf7cf682fbeb 100644 (file)
--- 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",
 };