aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco/spectrum_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/orinoco/spectrum_cs.c')
-rw-r--r--drivers/net/wireless/orinoco/spectrum_cs.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c
index b2ca2e39c2cb..9aefe19dbac2 100644
--- a/drivers/net/wireless/orinoco/spectrum_cs.c
+++ b/drivers/net/wireless/orinoco/spectrum_cs.c
@@ -133,7 +133,7 @@ spectrum_reset(struct pcmcia_device *link, int idle)
133 udelay(1000); 133 udelay(1000);
134 return 0; 134 return 0;
135 135
136 cs_failed: 136cs_failed:
137 cs_error(link, last_fn, last_ret); 137 cs_error(link, last_fn, last_ret);
138 return -ENODEV; 138 return -ENODEV;
139} 139}
@@ -171,7 +171,7 @@ spectrum_cs_stop_firmware(struct orinoco_private *priv, int idle)
171 * This creates an "instance" of the driver, allocating local data 171 * This creates an "instance" of the driver, allocating local data
172 * structures for one device. The device is registered with Card 172 * structures for one device. The device is registered with Card
173 * Services. 173 * Services.
174 * 174 *
175 * The dev_link structure is initialized, but we don't actually 175 * The dev_link structure is initialized, but we don't actually
176 * configure the card at this point -- we wait until we receive a card 176 * configure the card at this point -- we wait until we receive a card
177 * insertion event. */ 177 * insertion event. */
@@ -185,7 +185,7 @@ spectrum_cs_probe(struct pcmcia_device *link)
185 dev = alloc_orinocodev(sizeof(*card), &handle_to_dev(link), 185 dev = alloc_orinocodev(sizeof(*card), &handle_to_dev(link),
186 spectrum_cs_hard_reset, 186 spectrum_cs_hard_reset,
187 spectrum_cs_stop_firmware); 187 spectrum_cs_stop_firmware);
188 if (! dev) 188 if (!dev)
189 return -ENOMEM; 189 return -ENOMEM;
190 priv = netdev_priv(dev); 190 priv = netdev_priv(dev);
191 card = priv->card; 191 card = priv->card;
@@ -198,7 +198,7 @@ spectrum_cs_probe(struct pcmcia_device *link)
198 link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; 198 link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
199 link->irq.IRQInfo1 = IRQ_LEVEL_ID; 199 link->irq.IRQInfo1 = IRQ_LEVEL_ID;
200 link->irq.Handler = orinoco_interrupt; 200 link->irq.Handler = orinoco_interrupt;
201 link->irq.Instance = dev; 201 link->irq.Instance = dev;
202 202
203 /* General socket configuration defaults can go here. In this 203 /* General socket configuration defaults can go here. In this
204 * client, we assume very little, and rely on the CIS for 204 * client, we assume very little, and rely on the CIS for
@@ -367,9 +367,8 @@ spectrum_cs_config(struct pcmcia_device *link)
367 card->node.major = card->node.minor = 0; 367 card->node.major = card->node.minor = 0;
368 368
369 /* Reset card */ 369 /* Reset card */
370 if (spectrum_cs_hard_reset(priv) != 0) { 370 if (spectrum_cs_hard_reset(priv) != 0)
371 goto failed; 371 goto failed;
372 }
373 372
374 SET_NETDEV_DEV(dev, &handle_to_dev(link)); 373 SET_NETDEV_DEV(dev, &handle_to_dev(link));
375 /* Tell the stack we exist */ 374 /* Tell the stack we exist */
@@ -382,8 +381,8 @@ spectrum_cs_config(struct pcmcia_device *link)
382 * initialized and arranged in a linked list at link->dev_node. */ 381 * initialized and arranged in a linked list at link->dev_node. */
383 strcpy(card->node.dev_name, dev->name); 382 strcpy(card->node.dev_name, dev->name);
384 link->dev_node = &card->node; /* link->dev_node being non-NULL is also 383 link->dev_node = &card->node; /* link->dev_node being non-NULL is also
385 used to indicate that the 384 * used to indicate that the
386 net_device has been registered */ 385 * net_device has been registered */
387 386
388 /* Finally, report what we've done */ 387 /* Finally, report what we've done */
389 printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io " 388 printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io "