UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Frans Pop 2010-03-24 07:57:31 +00:00 committed by David S. Miller
parent 19299b34b4
commit 583d077d35
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ps3_gelic_net.c
View File

@ -326,7 +326,7 @@ static int gelic_descr_prepare_rx(struct gelic_card *card,
unsigned int bufsize; unsigned int bufsize;
if (gelic_descr_get_status(descr) != GELIC_DESCR_DMA_NOT_IN_USE) if (gelic_descr_get_status(descr) != GELIC_DESCR_DMA_NOT_IN_USE)
dev_info(ctodev(card), "%s: ERROR status \n", __func__); dev_info(ctodev(card), "%s: ERROR status\n", __func__);
/* we need to round up the buffer size to a multiple of 128 */ /* we need to round up the buffer size to a multiple of 128 */
bufsize = ALIGN(GELIC_NET_MAX_MTU, GELIC_NET_RXBUF_ALIGN); bufsize = ALIGN(GELIC_NET_MAX_MTU, GELIC_NET_RXBUF_ALIGN);
@ -1434,7 +1434,7 @@ static void gelic_net_tx_timeout_task(struct work_struct *work)
container_of(work, struct gelic_card, tx_timeout_task); container_of(work, struct gelic_card, tx_timeout_task);
struct net_device *netdev = card->netdev[GELIC_PORT_ETHERNET_0]; struct net_device *netdev = card->netdev[GELIC_PORT_ETHERNET_0];
dev_info(ctodev(card), "%s:Timed out. Restarting... \n", __func__); dev_info(ctodev(card), "%s:Timed out. Restarting...\n", __func__);
if (!(netdev->flags & IFF_UP)) if (!(netdev->flags & IFF_UP))
goto out; goto out;

34
drivers/net/ps3_gelic_wireless.c
View File

@ -527,7 +527,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
u8 item_len; u8 item_len;
u8 item_id; u8 item_id;
pr_debug("%s: data=%p len=%ld \n", __func__, pr_debug("%s: data=%p len=%ld\n", __func__,
data, len); data, len);
memset(ie_info, 0, sizeof(struct ie_info)); memset(ie_info, 0, sizeof(struct ie_info));
@ -978,7 +978,7 @@ static int gelic_wl_set_essid(struct net_device *netdev,
pr_debug("%s: essid = '%s'\n", __func__, extra); pr_debug("%s: essid = '%s'\n", __func__, extra);
set_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat); set_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat);
} else { } else {
pr_debug("%s: ESSID any \n", __func__); pr_debug("%s: ESSID any\n", __func__);
clear_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat); clear_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat);
} }
set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat); set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
@ -986,7 +986,7 @@ static int gelic_wl_set_essid(struct net_device *netdev,
gelic_wl_try_associate(netdev); /* FIXME */ gelic_wl_try_associate(netdev); /* FIXME */
pr_debug("%s: -> \n", __func__); pr_debug("%s: ->\n", __func__);
return 0; return 0;
} }
@ -997,7 +997,7 @@ static int gelic_wl_get_essid(struct net_device *netdev,
struct gelic_wl_info *wl = port_wl(netdev_priv(netdev)); struct gelic_wl_info *wl = port_wl(netdev_priv(netdev));
unsigned long irqflag; unsigned long irqflag;
pr_debug("%s: <- \n", __func__); pr_debug("%s: <-\n", __func__);
mutex_lock(&wl->assoc_stat_lock); mutex_lock(&wl->assoc_stat_lock);
spin_lock_irqsave(&wl->lock, irqflag); spin_lock_irqsave(&wl->lock, irqflag);
if (test_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat) || if (test_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat) ||
@ -1010,7 +1010,7 @@ static int gelic_wl_get_essid(struct net_device *netdev,
mutex_unlock(&wl->assoc_stat_lock); mutex_unlock(&wl->assoc_stat_lock);
spin_unlock_irqrestore(&wl->lock, irqflag); spin_unlock_irqrestore(&wl->lock, irqflag);
pr_debug("%s: -> len=%d \n", __func__, data->essid.length); pr_debug("%s: -> len=%d\n", __func__, data->essid.length);
return 0; return 0;
} }
@ -1027,7 +1027,7 @@ static int gelic_wl_set_encode(struct net_device *netdev,
int key_index, index_specified; int key_index, index_specified;
int ret = 0; int ret = 0;
pr_debug("%s: <- \n", __func__); pr_debug("%s: <-\n", __func__);
flags = enc->flags & IW_ENCODE_FLAGS; flags = enc->flags & IW_ENCODE_FLAGS;
key_index = enc->flags & IW_ENCODE_INDEX; key_index = enc->flags & IW_ENCODE_INDEX;
@ -1086,7 +1086,7 @@ static int gelic_wl_set_encode(struct net_device *netdev,
set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat); set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
done: done:
spin_unlock_irqrestore(&wl->lock, irqflag); spin_unlock_irqrestore(&wl->lock, irqflag);
pr_debug("%s: -> \n", __func__); pr_debug("%s: ->\n", __func__);
return ret; return ret;
} }
@ -1100,7 +1100,7 @@ static int gelic_wl_get_encode(struct net_device *netdev,
unsigned int key_index, index_specified; unsigned int key_index, index_specified;
int ret = 0; int ret = 0;
pr_debug("%s: <- \n", __func__); pr_debug("%s: <-\n", __func__);
key_index = enc->flags & IW_ENCODE_INDEX; key_index = enc->flags & IW_ENCODE_INDEX;
pr_debug("%s: flag=%#x point=%p len=%d extra=%p\n", __func__, pr_debug("%s: flag=%#x point=%p len=%d extra=%p\n", __func__,
enc->flags, enc->pointer, enc->length, extra); enc->flags, enc->pointer, enc->length, extra);
@ -1214,7 +1214,7 @@ static int gelic_wl_set_encodeext(struct net_device *netdev,
int key_index; int key_index;
int ret = 0; int ret = 0;
pr_debug("%s: <- \n", __func__); pr_debug("%s: <-\n", __func__);
flags = enc->flags & IW_ENCODE_FLAGS; flags = enc->flags & IW_ENCODE_FLAGS;
alg = ext->alg; alg = ext->alg;
key_index = enc->flags & IW_ENCODE_INDEX; key_index = enc->flags & IW_ENCODE_INDEX;
@ -1287,7 +1287,7 @@ static int gelic_wl_set_encodeext(struct net_device *netdev,
} }
done: done:
spin_unlock_irqrestore(&wl->lock, irqflag); spin_unlock_irqrestore(&wl->lock, irqflag);
pr_debug("%s: -> \n", __func__); pr_debug("%s: ->\n", __func__);
return ret; return ret;
} }
@ -1303,7 +1303,7 @@ static int gelic_wl_get_encodeext(struct net_device *netdev,
int ret = 0; int ret = 0;
int max_key_len; int max_key_len;
pr_debug("%s: <- \n", __func__); pr_debug("%s: <-\n", __func__);
max_key_len = enc->length - sizeof(struct iw_encode_ext); max_key_len = enc->length - sizeof(struct iw_encode_ext);
if (max_key_len < 0) if (max_key_len < 0)
@ -1358,7 +1358,7 @@ static int gelic_wl_get_encodeext(struct net_device *netdev,
} }
out: out:
spin_unlock_irqrestore(&wl->lock, irqflag); spin_unlock_irqrestore(&wl->lock, irqflag);
pr_debug("%s: -> \n", __func__); pr_debug("%s: ->\n", __func__);
return ret; return ret;
} }
/* SIOC{S,G}IWMODE */ /* SIOC{S,G}IWMODE */
@ -1369,7 +1369,7 @@ static int gelic_wl_set_mode(struct net_device *netdev,
__u32 mode = data->mode; __u32 mode = data->mode;
int ret; int ret;
pr_debug("%s: <- \n", __func__); pr_debug("%s: <-\n", __func__);
if (mode == IW_MODE_INFRA) if (mode == IW_MODE_INFRA)
ret = 0; ret = 0;
else else
@ -1383,7 +1383,7 @@ static int gelic_wl_get_mode(struct net_device *netdev,
union iwreq_data *data, char *extra) union iwreq_data *data, char *extra)
{ {
__u32 *mode = &data->mode; __u32 *mode = &data->mode;
pr_debug("%s: <- \n", __func__); pr_debug("%s: <-\n", __func__);
*mode = IW_MODE_INFRA; *mode = IW_MODE_INFRA;
pr_debug("%s: ->\n", __func__); pr_debug("%s: ->\n", __func__);
return 0; return 0;
@ -2021,7 +2021,7 @@ static int gelic_wl_associate_bss(struct gelic_wl_info *wl,
if (!rc) { if (!rc) {
/* timeouted. Maybe key or cyrpt mode is wrong */ /* timeouted. Maybe key or cyrpt mode is wrong */
pr_info("%s: connect timeout \n", __func__); pr_info("%s: connect timeout\n", __func__);
cmd = gelic_eurus_sync_cmd(wl, GELIC_EURUS_CMD_DISASSOC, cmd = gelic_eurus_sync_cmd(wl, GELIC_EURUS_CMD_DISASSOC,
NULL, 0); NULL, 0);
kfree(cmd); kfree(cmd);
@ -2062,7 +2062,7 @@ static void gelic_wl_connected_event(struct gelic_wl_info *wl,
} }
if (desired_event == event) { if (desired_event == event) {
pr_debug("%s: completed \n", __func__); pr_debug("%s: completed\n", __func__);
complete(&wl->assoc_done); complete(&wl->assoc_done);
netif_carrier_on(port_to_netdev(wl_port(wl))); netif_carrier_on(port_to_netdev(wl_port(wl)));
} else } else
@ -2317,7 +2317,7 @@ static struct net_device * __devinit gelic_wl_alloc(struct gelic_card *card)
pr_debug("%s:start\n", __func__); pr_debug("%s:start\n", __func__);
netdev = alloc_etherdev(sizeof(struct gelic_port) + netdev = alloc_etherdev(sizeof(struct gelic_port) +
sizeof(struct gelic_wl_info)); sizeof(struct gelic_wl_info));
pr_debug("%s: netdev =%p card=%p \np", __func__, netdev, card); pr_debug("%s: netdev =%p card=%p\n", __func__, netdev, card);
if (!netdev) if (!netdev)
return NULL; return NULL;