diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-12-14 22:53:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:07:28 -0500 |
commit | 7e226272fcf9c1ec8b67fac995ce4227f4f76971 (patch) | |
tree | 1eaa955793494207f5651cdb78078b9db4c34fb1 /drivers/net/wireless/libertas | |
parent | eae86bf378de981696697426831bd9db68930740 (diff) |
libertas: kill whitespace at end of lines
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r-- | drivers/net/wireless/libertas/cmd.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/cmd.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/debugfs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_sdio.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 14 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/tx.c | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index 171acc27ffba..ffef7212621e 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/drivers/net/wireless/libertas/cmd.c | |||
@@ -1122,7 +1122,7 @@ int lbs_mesh_config(struct lbs_private *priv, uint16_t enable, uint16_t chan) | |||
1122 | cmd.action = cpu_to_le16(enable); | 1122 | cmd.action = cpu_to_le16(enable); |
1123 | cmd.channel = cpu_to_le16(chan); | 1123 | cmd.channel = cpu_to_le16(chan); |
1124 | cmd.type = cpu_to_le16(priv->mesh_tlv); | 1124 | cmd.type = cpu_to_le16(priv->mesh_tlv); |
1125 | 1125 | ||
1126 | if (enable) { | 1126 | if (enable) { |
1127 | cmd.length = cpu_to_le16(priv->mesh_ssid_len); | 1127 | cmd.length = cpu_to_le16(priv->mesh_ssid_len); |
1128 | memcpy(cmd.data, priv->mesh_ssid, priv->mesh_ssid_len); | 1128 | memcpy(cmd.data, priv->mesh_ssid, priv->mesh_ssid_len); |
diff --git a/drivers/net/wireless/libertas/cmd.h b/drivers/net/wireless/libertas/cmd.h index a4aaa6b34a70..999fabe5964b 100644 --- a/drivers/net/wireless/libertas/cmd.h +++ b/drivers/net/wireless/libertas/cmd.h | |||
@@ -11,9 +11,9 @@ | |||
11 | 11 | ||
12 | #define lbs_cmd_with_response(priv, cmdnr, cmd) \ | 12 | #define lbs_cmd_with_response(priv, cmdnr, cmd) \ |
13 | lbs_cmd(priv, cmdnr, cmd, lbs_cmd_copyback, (unsigned long) (cmd)) | 13 | lbs_cmd(priv, cmdnr, cmd, lbs_cmd_copyback, (unsigned long) (cmd)) |
14 | 14 | ||
15 | int __lbs_cmd(struct lbs_private *priv, uint16_t command, | 15 | int __lbs_cmd(struct lbs_private *priv, uint16_t command, |
16 | struct cmd_header *in_cmd, int in_cmd_size, | 16 | struct cmd_header *in_cmd, int in_cmd_size, |
17 | int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *), | 17 | int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *), |
18 | unsigned long callback_arg); | 18 | unsigned long callback_arg); |
19 | 19 | ||
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c index c5130a2581fe..f27815967142 100644 --- a/drivers/net/wireless/libertas/debugfs.c +++ b/drivers/net/wireless/libertas/debugfs.c | |||
@@ -296,7 +296,7 @@ static ssize_t lbs_setuserscan(struct file *file, | |||
296 | 296 | ||
297 | if (!buf) | 297 | if (!buf) |
298 | return -ENOMEM; | 298 | return -ENOMEM; |
299 | 299 | ||
300 | buf_size = min(count, len - 1); | 300 | buf_size = min(count, len - 1); |
301 | if (copy_from_user(buf, userbuf, buf_size)) { | 301 | if (copy_from_user(buf, userbuf, buf_size)) { |
302 | res = -EFAULT; | 302 | res = -EFAULT; |
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index 7f829c86c45d..9225546b9d48 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c | |||
@@ -19,7 +19,7 @@ | |||
19 | * current block size. | 19 | * current block size. |
20 | * | 20 | * |
21 | * As SDIO is still new to the kernel, it is unfortunately common with | 21 | * As SDIO is still new to the kernel, it is unfortunately common with |
22 | * bugs in the host controllers related to that. One such bug is that | 22 | * bugs in the host controllers related to that. One such bug is that |
23 | * controllers cannot do transfers that aren't a multiple of 4 bytes. | 23 | * controllers cannot do transfers that aren't a multiple of 4 bytes. |
24 | * If you don't have time to fix the host controller driver, you can | 24 | * If you don't have time to fix the host controller driver, you can |
25 | * work around the problem by modifying if_sdio_host_to_card() and | 25 | * work around the problem by modifying if_sdio_host_to_card() and |
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 9cb9e031040d..396ce676cad7 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c | |||
@@ -152,7 +152,7 @@ static int if_usb_probe(struct usb_interface *intf, | |||
152 | 152 | ||
153 | setup_timer(&cardp->fw_timeout, if_usb_fw_timeo, (unsigned long)cardp); | 153 | setup_timer(&cardp->fw_timeout, if_usb_fw_timeo, (unsigned long)cardp); |
154 | init_waitqueue_head(&cardp->fw_wq); | 154 | init_waitqueue_head(&cardp->fw_wq); |
155 | 155 | ||
156 | cardp->udev = udev; | 156 | cardp->udev = udev; |
157 | iface_desc = intf->cur_altsetting; | 157 | iface_desc = intf->cur_altsetting; |
158 | 158 | ||
@@ -871,7 +871,7 @@ restart: | |||
871 | 871 | ||
872 | /* ... and wait for the process to complete */ | 872 | /* ... and wait for the process to complete */ |
873 | wait_event_interruptible(cardp->fw_wq, cardp->surprise_removed || cardp->fwdnldover); | 873 | wait_event_interruptible(cardp->fw_wq, cardp->surprise_removed || cardp->fwdnldover); |
874 | 874 | ||
875 | del_timer_sync(&cardp->fw_timeout); | 875 | del_timer_sync(&cardp->fw_timeout); |
876 | usb_kill_urb(cardp->rx_urb); | 876 | usb_kill_urb(cardp->rx_urb); |
877 | 877 | ||
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index b51513fb59ec..0dc7de6a067b 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -255,7 +255,7 @@ static int lbs_add_rtap(struct lbs_private *priv); | |||
255 | static void lbs_remove_rtap(struct lbs_private *priv); | 255 | static void lbs_remove_rtap(struct lbs_private *priv); |
256 | static int lbs_add_mesh(struct lbs_private *priv); | 256 | static int lbs_add_mesh(struct lbs_private *priv); |
257 | static void lbs_remove_mesh(struct lbs_private *priv); | 257 | static void lbs_remove_mesh(struct lbs_private *priv); |
258 | 258 | ||
259 | 259 | ||
260 | /** | 260 | /** |
261 | * Get function for sysfs attribute rtap | 261 | * Get function for sysfs attribute rtap |
@@ -347,7 +347,7 @@ static ssize_t lbs_mesh_set(struct device *dev, | |||
347 | ret = lbs_mesh_config(priv, enable, priv->curbssparams.channel); | 347 | ret = lbs_mesh_config(priv, enable, priv->curbssparams.channel); |
348 | if (ret) | 348 | if (ret) |
349 | return ret; | 349 | return ret; |
350 | 350 | ||
351 | if (enable) | 351 | if (enable) |
352 | lbs_add_mesh(priv); | 352 | lbs_add_mesh(priv); |
353 | else | 353 | else |
@@ -401,7 +401,7 @@ static int lbs_dev_open(struct net_device *dev) | |||
401 | netif_carrier_on(dev); | 401 | netif_carrier_on(dev); |
402 | } else { | 402 | } else { |
403 | priv->infra_open = 1; | 403 | priv->infra_open = 1; |
404 | 404 | ||
405 | if (priv->connect_status == LBS_CONNECTED) | 405 | if (priv->connect_status == LBS_CONNECTED) |
406 | netif_carrier_on(dev); | 406 | netif_carrier_on(dev); |
407 | else | 407 | else |
@@ -433,7 +433,7 @@ static int lbs_mesh_stop(struct net_device *dev) | |||
433 | 433 | ||
434 | netif_stop_queue(dev); | 434 | netif_stop_queue(dev); |
435 | netif_carrier_off(dev); | 435 | netif_carrier_off(dev); |
436 | 436 | ||
437 | spin_unlock_irq(&priv->driver_lock); | 437 | spin_unlock_irq(&priv->driver_lock); |
438 | return 0; | 438 | return 0; |
439 | } | 439 | } |
@@ -453,7 +453,7 @@ static int lbs_eth_stop(struct net_device *dev) | |||
453 | priv->infra_open = 0; | 453 | priv->infra_open = 0; |
454 | 454 | ||
455 | netif_stop_queue(dev); | 455 | netif_stop_queue(dev); |
456 | 456 | ||
457 | spin_unlock_irq(&priv->driver_lock); | 457 | spin_unlock_irq(&priv->driver_lock); |
458 | return 0; | 458 | return 0; |
459 | } | 459 | } |
@@ -850,7 +850,7 @@ int lbs_suspend(struct lbs_private *priv) | |||
850 | } | 850 | } |
851 | 851 | ||
852 | memset(&cmd, 0, sizeof(cmd)); | 852 | memset(&cmd, 0, sizeof(cmd)); |
853 | 853 | ||
854 | ret = __lbs_cmd(priv, CMD_802_11_HOST_SLEEP_ACTIVATE, &cmd, | 854 | ret = __lbs_cmd(priv, CMD_802_11_HOST_SLEEP_ACTIVATE, &cmd, |
855 | sizeof(cmd), lbs_suspend_callback, 0); | 855 | sizeof(cmd), lbs_suspend_callback, 0); |
856 | if (ret) | 856 | if (ret) |
@@ -1180,7 +1180,7 @@ int lbs_start_card(struct lbs_private *priv) | |||
1180 | /* Enable mesh, if supported, and work out which TLV it uses. | 1180 | /* Enable mesh, if supported, and work out which TLV it uses. |
1181 | 0x100 + 291 is an unofficial value used in 5.110.20.pXX | 1181 | 0x100 + 291 is an unofficial value used in 5.110.20.pXX |
1182 | 0x100 + 37 is the official value used in 5.110.21.pXX | 1182 | 0x100 + 37 is the official value used in 5.110.21.pXX |
1183 | but we check them in that order because 20.pXX doesn't | 1183 | but we check them in that order because 20.pXX doesn't |
1184 | give an error -- it just silently fails. */ | 1184 | give an error -- it just silently fails. */ |
1185 | 1185 | ||
1186 | /* 5.110.20.pXX firmware will fail the command if the channel | 1186 | /* 5.110.20.pXX firmware will fail the command if the channel |
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c index 8a1a3965f1c5..00d95f75bd89 100644 --- a/drivers/net/wireless/libertas/tx.c +++ b/drivers/net/wireless/libertas/tx.c | |||
@@ -93,8 +93,8 @@ int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
93 | netif_stop_queue(priv->mesh_dev); | 93 | netif_stop_queue(priv->mesh_dev); |
94 | 94 | ||
95 | if (priv->tx_pending_len) { | 95 | if (priv->tx_pending_len) { |
96 | /* This can happen if packets come in on the mesh and eth | 96 | /* This can happen if packets come in on the mesh and eth |
97 | device simultaneously -- there's no mutual exclusion on | 97 | device simultaneously -- there's no mutual exclusion on |
98 | hard_start_xmit() calls between devices. */ | 98 | hard_start_xmit() calls between devices. */ |
99 | lbs_deb_tx("Packet on %s while busy\n", dev->name); | 99 | lbs_deb_tx("Packet on %s while busy\n", dev->name); |
100 | ret = NETDEV_TX_BUSY; | 100 | ret = NETDEV_TX_BUSY; |