diff options
author | Joe Perches <joe@perches.com> | 2010-11-30 16:42:08 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-02 15:16:47 -0500 |
commit | b2767363192d5937e0f61f05b1b6b881da9ee55a (patch) | |
tree | 98a4ac637246cb964a5c70c96c6b90ee9a67b632 | |
parent | e7797bf2c0297098056a95b6b03ea5a9a3285e36 (diff) |
wireless: Remove unnecessary casts of usb_get_intfdata
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ar9170/usb.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hif_usb.c | 13 | ||||
-rw-r--r-- | drivers/net/wireless/ath/carl9170/usb.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/p54/p54usb.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/zd1201.c | 2 |
5 files changed, 10 insertions, 16 deletions
diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c index 5dbb5361fd5..d3be6f9816b 100644 --- a/drivers/net/wireless/ath/ar9170/usb.c +++ b/drivers/net/wireless/ath/ar9170/usb.c | |||
@@ -161,8 +161,7 @@ static void ar9170_usb_submit_urb(struct ar9170_usb *aru) | |||
161 | static void ar9170_usb_tx_urb_complete_frame(struct urb *urb) | 161 | static void ar9170_usb_tx_urb_complete_frame(struct urb *urb) |
162 | { | 162 | { |
163 | struct sk_buff *skb = urb->context; | 163 | struct sk_buff *skb = urb->context; |
164 | struct ar9170_usb *aru = (struct ar9170_usb *) | 164 | struct ar9170_usb *aru = usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); |
165 | usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); | ||
166 | 165 | ||
167 | if (unlikely(!aru)) { | 166 | if (unlikely(!aru)) { |
168 | dev_kfree_skb_irq(skb); | 167 | dev_kfree_skb_irq(skb); |
@@ -219,8 +218,7 @@ free: | |||
219 | static void ar9170_usb_rx_completed(struct urb *urb) | 218 | static void ar9170_usb_rx_completed(struct urb *urb) |
220 | { | 219 | { |
221 | struct sk_buff *skb = urb->context; | 220 | struct sk_buff *skb = urb->context; |
222 | struct ar9170_usb *aru = (struct ar9170_usb *) | 221 | struct ar9170_usb *aru = usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); |
223 | usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); | ||
224 | int err; | 222 | int err; |
225 | 223 | ||
226 | if (!aru) | 224 | if (!aru) |
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index 63bf9a713ce..8946e8ad1b8 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c | |||
@@ -471,7 +471,7 @@ err: | |||
471 | static void ath9k_hif_usb_rx_cb(struct urb *urb) | 471 | static void ath9k_hif_usb_rx_cb(struct urb *urb) |
472 | { | 472 | { |
473 | struct sk_buff *skb = (struct sk_buff *) urb->context; | 473 | struct sk_buff *skb = (struct sk_buff *) urb->context; |
474 | struct hif_device_usb *hif_dev = (struct hif_device_usb *) | 474 | struct hif_device_usb *hif_dev = |
475 | usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); | 475 | usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); |
476 | int ret; | 476 | int ret; |
477 | 477 | ||
@@ -518,7 +518,7 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb) | |||
518 | { | 518 | { |
519 | struct sk_buff *skb = (struct sk_buff *) urb->context; | 519 | struct sk_buff *skb = (struct sk_buff *) urb->context; |
520 | struct sk_buff *nskb; | 520 | struct sk_buff *nskb; |
521 | struct hif_device_usb *hif_dev = (struct hif_device_usb *) | 521 | struct hif_device_usb *hif_dev = |
522 | usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); | 522 | usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); |
523 | int ret; | 523 | int ret; |
524 | 524 | ||
@@ -993,8 +993,7 @@ static void ath9k_hif_usb_reboot(struct usb_device *udev) | |||
993 | static void ath9k_hif_usb_disconnect(struct usb_interface *interface) | 993 | static void ath9k_hif_usb_disconnect(struct usb_interface *interface) |
994 | { | 994 | { |
995 | struct usb_device *udev = interface_to_usbdev(interface); | 995 | struct usb_device *udev = interface_to_usbdev(interface); |
996 | struct hif_device_usb *hif_dev = | 996 | struct hif_device_usb *hif_dev = usb_get_intfdata(interface); |
997 | (struct hif_device_usb *) usb_get_intfdata(interface); | ||
998 | 997 | ||
999 | if (hif_dev) { | 998 | if (hif_dev) { |
1000 | ath9k_htc_hw_deinit(hif_dev->htc_handle, | 999 | ath9k_htc_hw_deinit(hif_dev->htc_handle, |
@@ -1016,8 +1015,7 @@ static void ath9k_hif_usb_disconnect(struct usb_interface *interface) | |||
1016 | static int ath9k_hif_usb_suspend(struct usb_interface *interface, | 1015 | static int ath9k_hif_usb_suspend(struct usb_interface *interface, |
1017 | pm_message_t message) | 1016 | pm_message_t message) |
1018 | { | 1017 | { |
1019 | struct hif_device_usb *hif_dev = | 1018 | struct hif_device_usb *hif_dev = usb_get_intfdata(interface); |
1020 | (struct hif_device_usb *) usb_get_intfdata(interface); | ||
1021 | 1019 | ||
1022 | ath9k_hif_usb_dealloc_urbs(hif_dev); | 1020 | ath9k_hif_usb_dealloc_urbs(hif_dev); |
1023 | 1021 | ||
@@ -1026,8 +1024,7 @@ static int ath9k_hif_usb_suspend(struct usb_interface *interface, | |||
1026 | 1024 | ||
1027 | static int ath9k_hif_usb_resume(struct usb_interface *interface) | 1025 | static int ath9k_hif_usb_resume(struct usb_interface *interface) |
1028 | { | 1026 | { |
1029 | struct hif_device_usb *hif_dev = | 1027 | struct hif_device_usb *hif_dev = usb_get_intfdata(interface); |
1030 | (struct hif_device_usb *) usb_get_intfdata(interface); | ||
1031 | struct htc_target *htc_handle = hif_dev->htc_handle; | 1028 | struct htc_target *htc_handle = hif_dev->htc_handle; |
1032 | int ret; | 1029 | int ret; |
1033 | 1030 | ||
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c index a268053e18e..2d947a30d29 100644 --- a/drivers/net/wireless/ath/carl9170/usb.c +++ b/drivers/net/wireless/ath/carl9170/usb.c | |||
@@ -160,8 +160,7 @@ err_acc: | |||
160 | 160 | ||
161 | static void carl9170_usb_tx_data_complete(struct urb *urb) | 161 | static void carl9170_usb_tx_data_complete(struct urb *urb) |
162 | { | 162 | { |
163 | struct ar9170 *ar = (struct ar9170 *) | 163 | struct ar9170 *ar = usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); |
164 | usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); | ||
165 | 164 | ||
166 | if (WARN_ON_ONCE(!ar)) { | 165 | if (WARN_ON_ONCE(!ar)) { |
167 | dev_kfree_skb_irq(urb->context); | 166 | dev_kfree_skb_irq(urb->context); |
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index d5bc21e5a02..dd4d8fc9ad7 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c | |||
@@ -183,7 +183,7 @@ static void p54u_rx_cb(struct urb *urb) | |||
183 | static void p54u_tx_cb(struct urb *urb) | 183 | static void p54u_tx_cb(struct urb *urb) |
184 | { | 184 | { |
185 | struct sk_buff *skb = urb->context; | 185 | struct sk_buff *skb = urb->context; |
186 | struct ieee80211_hw *dev = (struct ieee80211_hw *) | 186 | struct ieee80211_hw *dev = |
187 | usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); | 187 | usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0)); |
188 | 188 | ||
189 | p54_free_skb(dev, skb); | 189 | p54_free_skb(dev, skb); |
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index b97aa9c78a9..415eec401e2 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c | |||
@@ -1830,7 +1830,7 @@ err_zd: | |||
1830 | 1830 | ||
1831 | static void zd1201_disconnect(struct usb_interface *interface) | 1831 | static void zd1201_disconnect(struct usb_interface *interface) |
1832 | { | 1832 | { |
1833 | struct zd1201 *zd=(struct zd1201 *)usb_get_intfdata(interface); | 1833 | struct zd1201 *zd = usb_get_intfdata(interface); |
1834 | struct hlist_node *node, *node2; | 1834 | struct hlist_node *node, *node2; |
1835 | struct zd1201_frag *frag; | 1835 | struct zd1201_frag *frag; |
1836 | 1836 | ||