diff options
Diffstat (limited to 'drivers/net/wireless/libertas/if_cs.c')
-rw-r--r-- | drivers/net/wireless/libertas/if_cs.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index b0b95cf2e7c9..5fadcc03eea5 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c | |||
@@ -57,7 +57,7 @@ MODULE_LICENSE("GPL"); | |||
57 | 57 | ||
58 | struct if_cs_card { | 58 | struct if_cs_card { |
59 | struct pcmcia_device *p_dev; | 59 | struct pcmcia_device *p_dev; |
60 | lbs_private *priv; | 60 | struct lbs_private *priv; |
61 | void __iomem *iobase; | 61 | void __iomem *iobase; |
62 | }; | 62 | }; |
63 | 63 | ||
@@ -286,7 +286,7 @@ static irqreturn_t if_cs_interrupt(int irq, void *data) | |||
286 | /* | 286 | /* |
287 | * Called from if_cs_host_to_card to send a command to the hardware | 287 | * Called from if_cs_host_to_card to send a command to the hardware |
288 | */ | 288 | */ |
289 | static int if_cs_send_cmd(lbs_private *priv, u8 *buf, u16 nb) | 289 | static int if_cs_send_cmd(struct lbs_private *priv, u8 *buf, u16 nb) |
290 | { | 290 | { |
291 | struct if_cs_card *card = (struct if_cs_card *)priv->card; | 291 | struct if_cs_card *card = (struct if_cs_card *)priv->card; |
292 | int ret = -1; | 292 | int ret = -1; |
@@ -331,7 +331,7 @@ done: | |||
331 | /* | 331 | /* |
332 | * Called from if_cs_host_to_card to send a data to the hardware | 332 | * Called from if_cs_host_to_card to send a data to the hardware |
333 | */ | 333 | */ |
334 | static void if_cs_send_data(lbs_private *priv, u8 *buf, u16 nb) | 334 | static void if_cs_send_data(struct lbs_private *priv, u8 *buf, u16 nb) |
335 | { | 335 | { |
336 | struct if_cs_card *card = (struct if_cs_card *)priv->card; | 336 | struct if_cs_card *card = (struct if_cs_card *)priv->card; |
337 | 337 | ||
@@ -354,7 +354,7 @@ static void if_cs_send_data(lbs_private *priv, u8 *buf, u16 nb) | |||
354 | /* | 354 | /* |
355 | * Get the command result out of the card. | 355 | * Get the command result out of the card. |
356 | */ | 356 | */ |
357 | static int if_cs_receive_cmdres(lbs_private *priv, u8 *data, u32 *len) | 357 | static int if_cs_receive_cmdres(struct lbs_private *priv, u8 *data, u32 *len) |
358 | { | 358 | { |
359 | int ret = -1; | 359 | int ret = -1; |
360 | u16 val; | 360 | u16 val; |
@@ -386,7 +386,7 @@ out: | |||
386 | } | 386 | } |
387 | 387 | ||
388 | 388 | ||
389 | static struct sk_buff *if_cs_receive_data(lbs_private *priv) | 389 | static struct sk_buff *if_cs_receive_data(struct lbs_private *priv) |
390 | { | 390 | { |
391 | struct sk_buff *skb = NULL; | 391 | struct sk_buff *skb = NULL; |
392 | u16 len; | 392 | u16 len; |
@@ -616,7 +616,10 @@ done: | |||
616 | /********************************************************************/ | 616 | /********************************************************************/ |
617 | 617 | ||
618 | /* Send commands or data packets to the card */ | 618 | /* Send commands or data packets to the card */ |
619 | static int if_cs_host_to_card(lbs_private *priv, u8 type, u8 *buf, u16 nb) | 619 | static int if_cs_host_to_card(struct lbs_private *priv, |
620 | u8 type, | ||
621 | u8 *buf, | ||
622 | u16 nb) | ||
620 | { | 623 | { |
621 | int ret = -1; | 624 | int ret = -1; |
622 | 625 | ||
@@ -641,10 +644,10 @@ static int if_cs_host_to_card(lbs_private *priv, u8 type, u8 *buf, u16 nb) | |||
641 | } | 644 | } |
642 | 645 | ||
643 | 646 | ||
644 | static int if_cs_get_int_status(lbs_private *priv, u8 *ireg) | 647 | static int if_cs_get_int_status(struct lbs_private *priv, u8 *ireg) |
645 | { | 648 | { |
646 | struct if_cs_card *card = (struct if_cs_card *)priv->card; | 649 | struct if_cs_card *card = (struct if_cs_card *)priv->card; |
647 | /* lbs_adapter *adapter = priv->adapter; */ | 650 | /* struct lbs_adapter *adapter = priv->adapter; */ |
648 | int ret = 0; | 651 | int ret = 0; |
649 | u16 int_cause; | 652 | u16 int_cause; |
650 | u8 *cmdbuf; | 653 | u8 *cmdbuf; |
@@ -698,7 +701,7 @@ out: | |||
698 | } | 701 | } |
699 | 702 | ||
700 | 703 | ||
701 | static int if_cs_read_event_cause(lbs_private *priv) | 704 | static int if_cs_read_event_cause(struct lbs_private *priv) |
702 | { | 705 | { |
703 | lbs_deb_enter(LBS_DEB_CS); | 706 | lbs_deb_enter(LBS_DEB_CS); |
704 | 707 | ||
@@ -746,7 +749,7 @@ static void if_cs_release(struct pcmcia_device *p_dev) | |||
746 | static int if_cs_probe(struct pcmcia_device *p_dev) | 749 | static int if_cs_probe(struct pcmcia_device *p_dev) |
747 | { | 750 | { |
748 | int ret = -ENOMEM; | 751 | int ret = -ENOMEM; |
749 | lbs_private *priv; | 752 | struct lbs_private *priv; |
750 | struct if_cs_card *card; | 753 | struct if_cs_card *card; |
751 | /* CIS parsing */ | 754 | /* CIS parsing */ |
752 | tuple_t tuple; | 755 | tuple_t tuple; |