diff options
author | Frans Pop <elendil@planet.nl> | 2010-03-24 03:57:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-24 17:01:55 -0400 |
commit | 583d077d35dd8df231c1e391e5406f0faf1a1788 (patch) | |
tree | a5d85fa9996968928235936fa1b41613261a524f /drivers/net | |
parent | 19299b34b42f4d37be2ce9b411664f37ca10ff61 (diff) |
net/ps3_gelic: remove trailing space in messages
ps3_gelic_wireless.c: also remove a stray "p" after a newline.
Signed-off-by: Frans Pop <elendil@planet.nl>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ps3_gelic_net.c | 4 | ||||
-rw-r--r-- | drivers/net/ps3_gelic_wireless.c | 34 |
2 files changed, 19 insertions, 19 deletions
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index a849f6f23a17..a602da6418c8 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
@@ -326,7 +326,7 @@ static int gelic_descr_prepare_rx(struct gelic_card *card, | |||
326 | unsigned int bufsize; | 326 | unsigned int bufsize; |
327 | 327 | ||
328 | if (gelic_descr_get_status(descr) != GELIC_DESCR_DMA_NOT_IN_USE) | 328 | if (gelic_descr_get_status(descr) != GELIC_DESCR_DMA_NOT_IN_USE) |
329 | dev_info(ctodev(card), "%s: ERROR status \n", __func__); | 329 | dev_info(ctodev(card), "%s: ERROR status\n", __func__); |
330 | /* we need to round up the buffer size to a multiple of 128 */ | 330 | /* we need to round up the buffer size to a multiple of 128 */ |
331 | bufsize = ALIGN(GELIC_NET_MAX_MTU, GELIC_NET_RXBUF_ALIGN); | 331 | bufsize = ALIGN(GELIC_NET_MAX_MTU, GELIC_NET_RXBUF_ALIGN); |
332 | 332 | ||
@@ -1434,7 +1434,7 @@ static void gelic_net_tx_timeout_task(struct work_struct *work) | |||
1434 | container_of(work, struct gelic_card, tx_timeout_task); | 1434 | container_of(work, struct gelic_card, tx_timeout_task); |
1435 | struct net_device *netdev = card->netdev[GELIC_PORT_ETHERNET_0]; | 1435 | struct net_device *netdev = card->netdev[GELIC_PORT_ETHERNET_0]; |
1436 | 1436 | ||
1437 | dev_info(ctodev(card), "%s:Timed out. Restarting... \n", __func__); | 1437 | dev_info(ctodev(card), "%s:Timed out. Restarting...\n", __func__); |
1438 | 1438 | ||
1439 | if (!(netdev->flags & IFF_UP)) | 1439 | if (!(netdev->flags & IFF_UP)) |
1440 | goto out; | 1440 | goto out; |
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c index 2663b2fdc0bb..505f9a194369 100644 --- a/drivers/net/ps3_gelic_wireless.c +++ b/drivers/net/ps3_gelic_wireless.c | |||
@@ -527,7 +527,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len, | |||
527 | u8 item_len; | 527 | u8 item_len; |
528 | u8 item_id; | 528 | u8 item_id; |
529 | 529 | ||
530 | pr_debug("%s: data=%p len=%ld \n", __func__, | 530 | pr_debug("%s: data=%p len=%ld\n", __func__, |
531 | data, len); | 531 | data, len); |
532 | memset(ie_info, 0, sizeof(struct ie_info)); | 532 | memset(ie_info, 0, sizeof(struct ie_info)); |
533 | 533 | ||
@@ -978,7 +978,7 @@ static int gelic_wl_set_essid(struct net_device *netdev, | |||
978 | pr_debug("%s: essid = '%s'\n", __func__, extra); | 978 | pr_debug("%s: essid = '%s'\n", __func__, extra); |
979 | set_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat); | 979 | set_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat); |
980 | } else { | 980 | } else { |
981 | pr_debug("%s: ESSID any \n", __func__); | 981 | pr_debug("%s: ESSID any\n", __func__); |
982 | clear_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat); | 982 | clear_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat); |
983 | } | 983 | } |
984 | set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat); | 984 | set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat); |
@@ -986,7 +986,7 @@ static int gelic_wl_set_essid(struct net_device *netdev, | |||
986 | 986 | ||
987 | 987 | ||
988 | gelic_wl_try_associate(netdev); /* FIXME */ | 988 | gelic_wl_try_associate(netdev); /* FIXME */ |
989 | pr_debug("%s: -> \n", __func__); | 989 | pr_debug("%s: ->\n", __func__); |
990 | return 0; | 990 | return 0; |
991 | } | 991 | } |
992 | 992 | ||
@@ -997,7 +997,7 @@ static int gelic_wl_get_essid(struct net_device *netdev, | |||
997 | struct gelic_wl_info *wl = port_wl(netdev_priv(netdev)); | 997 | struct gelic_wl_info *wl = port_wl(netdev_priv(netdev)); |
998 | unsigned long irqflag; | 998 | unsigned long irqflag; |
999 | 999 | ||
1000 | pr_debug("%s: <- \n", __func__); | 1000 | pr_debug("%s: <-\n", __func__); |
1001 | mutex_lock(&wl->assoc_stat_lock); | 1001 | mutex_lock(&wl->assoc_stat_lock); |
1002 | spin_lock_irqsave(&wl->lock, irqflag); | 1002 | spin_lock_irqsave(&wl->lock, irqflag); |
1003 | if (test_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat) || | 1003 | if (test_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat) || |
@@ -1010,7 +1010,7 @@ static int gelic_wl_get_essid(struct net_device *netdev, | |||
1010 | 1010 | ||
1011 | mutex_unlock(&wl->assoc_stat_lock); | 1011 | mutex_unlock(&wl->assoc_stat_lock); |
1012 | spin_unlock_irqrestore(&wl->lock, irqflag); | 1012 | spin_unlock_irqrestore(&wl->lock, irqflag); |
1013 | pr_debug("%s: -> len=%d \n", __func__, data->essid.length); | 1013 | pr_debug("%s: -> len=%d\n", __func__, data->essid.length); |
1014 | 1014 | ||
1015 | return 0; | 1015 | return 0; |
1016 | } | 1016 | } |
@@ -1027,7 +1027,7 @@ static int gelic_wl_set_encode(struct net_device *netdev, | |||
1027 | int key_index, index_specified; | 1027 | int key_index, index_specified; |
1028 | int ret = 0; | 1028 | int ret = 0; |
1029 | 1029 | ||
1030 | pr_debug("%s: <- \n", __func__); | 1030 | pr_debug("%s: <-\n", __func__); |
1031 | flags = enc->flags & IW_ENCODE_FLAGS; | 1031 | flags = enc->flags & IW_ENCODE_FLAGS; |
1032 | key_index = enc->flags & IW_ENCODE_INDEX; | 1032 | key_index = enc->flags & IW_ENCODE_INDEX; |
1033 | 1033 | ||
@@ -1086,7 +1086,7 @@ static int gelic_wl_set_encode(struct net_device *netdev, | |||
1086 | set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat); | 1086 | set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat); |
1087 | done: | 1087 | done: |
1088 | spin_unlock_irqrestore(&wl->lock, irqflag); | 1088 | spin_unlock_irqrestore(&wl->lock, irqflag); |
1089 | pr_debug("%s: -> \n", __func__); | 1089 | pr_debug("%s: ->\n", __func__); |
1090 | return ret; | 1090 | return ret; |
1091 | } | 1091 | } |
1092 | 1092 | ||
@@ -1100,7 +1100,7 @@ static int gelic_wl_get_encode(struct net_device *netdev, | |||
1100 | unsigned int key_index, index_specified; | 1100 | unsigned int key_index, index_specified; |
1101 | int ret = 0; | 1101 | int ret = 0; |
1102 | 1102 | ||
1103 | pr_debug("%s: <- \n", __func__); | 1103 | pr_debug("%s: <-\n", __func__); |
1104 | key_index = enc->flags & IW_ENCODE_INDEX; | 1104 | key_index = enc->flags & IW_ENCODE_INDEX; |
1105 | pr_debug("%s: flag=%#x point=%p len=%d extra=%p\n", __func__, | 1105 | pr_debug("%s: flag=%#x point=%p len=%d extra=%p\n", __func__, |
1106 | enc->flags, enc->pointer, enc->length, extra); | 1106 | enc->flags, enc->pointer, enc->length, extra); |
@@ -1214,7 +1214,7 @@ static int gelic_wl_set_encodeext(struct net_device *netdev, | |||
1214 | int key_index; | 1214 | int key_index; |
1215 | int ret = 0; | 1215 | int ret = 0; |
1216 | 1216 | ||
1217 | pr_debug("%s: <- \n", __func__); | 1217 | pr_debug("%s: <-\n", __func__); |
1218 | flags = enc->flags & IW_ENCODE_FLAGS; | 1218 | flags = enc->flags & IW_ENCODE_FLAGS; |
1219 | alg = ext->alg; | 1219 | alg = ext->alg; |
1220 | key_index = enc->flags & IW_ENCODE_INDEX; | 1220 | key_index = enc->flags & IW_ENCODE_INDEX; |
@@ -1287,7 +1287,7 @@ static int gelic_wl_set_encodeext(struct net_device *netdev, | |||
1287 | } | 1287 | } |
1288 | done: | 1288 | done: |
1289 | spin_unlock_irqrestore(&wl->lock, irqflag); | 1289 | spin_unlock_irqrestore(&wl->lock, irqflag); |
1290 | pr_debug("%s: -> \n", __func__); | 1290 | pr_debug("%s: ->\n", __func__); |
1291 | return ret; | 1291 | return ret; |
1292 | } | 1292 | } |
1293 | 1293 | ||
@@ -1303,7 +1303,7 @@ static int gelic_wl_get_encodeext(struct net_device *netdev, | |||
1303 | int ret = 0; | 1303 | int ret = 0; |
1304 | int max_key_len; | 1304 | int max_key_len; |
1305 | 1305 | ||
1306 | pr_debug("%s: <- \n", __func__); | 1306 | pr_debug("%s: <-\n", __func__); |
1307 | 1307 | ||
1308 | max_key_len = enc->length - sizeof(struct iw_encode_ext); | 1308 | max_key_len = enc->length - sizeof(struct iw_encode_ext); |
1309 | if (max_key_len < 0) | 1309 | if (max_key_len < 0) |
@@ -1358,7 +1358,7 @@ static int gelic_wl_get_encodeext(struct net_device *netdev, | |||
1358 | } | 1358 | } |
1359 | out: | 1359 | out: |
1360 | spin_unlock_irqrestore(&wl->lock, irqflag); | 1360 | spin_unlock_irqrestore(&wl->lock, irqflag); |
1361 | pr_debug("%s: -> \n", __func__); | 1361 | pr_debug("%s: ->\n", __func__); |
1362 | return ret; | 1362 | return ret; |
1363 | } | 1363 | } |
1364 | /* SIOC{S,G}IWMODE */ | 1364 | /* SIOC{S,G}IWMODE */ |
@@ -1369,7 +1369,7 @@ static int gelic_wl_set_mode(struct net_device *netdev, | |||
1369 | __u32 mode = data->mode; | 1369 | __u32 mode = data->mode; |
1370 | int ret; | 1370 | int ret; |
1371 | 1371 | ||
1372 | pr_debug("%s: <- \n", __func__); | 1372 | pr_debug("%s: <-\n", __func__); |
1373 | if (mode == IW_MODE_INFRA) | 1373 | if (mode == IW_MODE_INFRA) |
1374 | ret = 0; | 1374 | ret = 0; |
1375 | else | 1375 | else |
@@ -1383,7 +1383,7 @@ static int gelic_wl_get_mode(struct net_device *netdev, | |||
1383 | union iwreq_data *data, char *extra) | 1383 | union iwreq_data *data, char *extra) |
1384 | { | 1384 | { |
1385 | __u32 *mode = &data->mode; | 1385 | __u32 *mode = &data->mode; |
1386 | pr_debug("%s: <- \n", __func__); | 1386 | pr_debug("%s: <-\n", __func__); |
1387 | *mode = IW_MODE_INFRA; | 1387 | *mode = IW_MODE_INFRA; |
1388 | pr_debug("%s: ->\n", __func__); | 1388 | pr_debug("%s: ->\n", __func__); |
1389 | return 0; | 1389 | return 0; |
@@ -2021,7 +2021,7 @@ static int gelic_wl_associate_bss(struct gelic_wl_info *wl, | |||
2021 | 2021 | ||
2022 | if (!rc) { | 2022 | if (!rc) { |
2023 | /* timeouted. Maybe key or cyrpt mode is wrong */ | 2023 | /* timeouted. Maybe key or cyrpt mode is wrong */ |
2024 | pr_info("%s: connect timeout \n", __func__); | 2024 | pr_info("%s: connect timeout\n", __func__); |
2025 | cmd = gelic_eurus_sync_cmd(wl, GELIC_EURUS_CMD_DISASSOC, | 2025 | cmd = gelic_eurus_sync_cmd(wl, GELIC_EURUS_CMD_DISASSOC, |
2026 | NULL, 0); | 2026 | NULL, 0); |
2027 | kfree(cmd); | 2027 | kfree(cmd); |
@@ -2062,7 +2062,7 @@ static void gelic_wl_connected_event(struct gelic_wl_info *wl, | |||
2062 | } | 2062 | } |
2063 | 2063 | ||
2064 | if (desired_event == event) { | 2064 | if (desired_event == event) { |
2065 | pr_debug("%s: completed \n", __func__); | 2065 | pr_debug("%s: completed\n", __func__); |
2066 | complete(&wl->assoc_done); | 2066 | complete(&wl->assoc_done); |
2067 | netif_carrier_on(port_to_netdev(wl_port(wl))); | 2067 | netif_carrier_on(port_to_netdev(wl_port(wl))); |
2068 | } else | 2068 | } else |
@@ -2317,7 +2317,7 @@ static struct net_device * __devinit gelic_wl_alloc(struct gelic_card *card) | |||
2317 | pr_debug("%s:start\n", __func__); | 2317 | pr_debug("%s:start\n", __func__); |
2318 | netdev = alloc_etherdev(sizeof(struct gelic_port) + | 2318 | netdev = alloc_etherdev(sizeof(struct gelic_port) + |
2319 | sizeof(struct gelic_wl_info)); | 2319 | sizeof(struct gelic_wl_info)); |
2320 | pr_debug("%s: netdev =%p card=%p \np", __func__, netdev, card); | 2320 | pr_debug("%s: netdev =%p card=%p\n", __func__, netdev, card); |
2321 | if (!netdev) | 2321 | if (!netdev) |
2322 | return NULL; | 2322 | return NULL; |
2323 | 2323 | ||