lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wireless/prism54: remove trailing space in messages

Browse Source 
Signed-off-by: Frans Pop <elendil@planet.nl>
Cc: Luis R. Rodriguez <mcgrof@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Frans Pop
2010-03-24 19:46:33 +01:00
committed by John W. Linville
parent 55f98938b5
commit 4a89852c35
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/p54/txrx.c
View File

@@ -38,7 +38,7 @@ static void p54_dump_tx_queue(struct p54_common *priv)
u32 largest_hole = 0, free; u32 largest_hole = 0, free;
spin_lock_irqsave(&priv->tx_queue.lock, flags); spin_lock_irqsave(&priv->tx_queue.lock, flags);
printk(KERN_DEBUG "%s: / --- tx queue dump (%d entries) --- \n", printk(KERN_DEBUG "%s: / --- tx queue dump (%d entries) ---\n",
wiphy_name(priv->hw->wiphy), skb_queue_len(&priv->tx_queue)); wiphy_name(priv->hw->wiphy), skb_queue_len(&priv->tx_queue));
prev_addr = priv->rx_start; prev_addr = priv->rx_start;

16
drivers/net/wireless/prism54/islpci_dev.c
View File

@@ -227,14 +227,14 @@ islpci_interrupt(int irq, void *config)
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_FUNCTION_CALLS, DEBUG(SHOW_FUNCTION_CALLS,
"IRQ: Identification register 0x%p 0x%x \n", device, reg); "IRQ: Identification register 0x%p 0x%x\n", device, reg);
#endif #endif
/* check for each bit in the register separately */ /* check for each bit in the register separately */
if (reg & ISL38XX_INT_IDENT_UPDATE) { if (reg & ISL38XX_INT_IDENT_UPDATE) {
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
/* Queue has been updated */ /* Queue has been updated */
DEBUG(SHOW_TRACING, "IRQ: Update flag \n"); DEBUG(SHOW_TRACING, "IRQ: Update flag\n");
DEBUG(SHOW_QUEUE_INDEXES, DEBUG(SHOW_QUEUE_INDEXES,
"CB drv Qs: [%i][%i][%i][%i][%i][%i]\n", "CB drv Qs: [%i][%i][%i][%i][%i][%i]\n",
@@ -300,7 +300,7 @@ islpci_interrupt(int irq, void *config)
ISL38XX_CB_RX_DATA_LQ) != 0) { ISL38XX_CB_RX_DATA_LQ) != 0) {
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_TRACING, DEBUG(SHOW_TRACING,
"Received frame in Data Low Queue \n"); "Received frame in Data Low Queue\n");
#endif #endif
islpci_eth_receive(priv); islpci_eth_receive(priv);
} }
@@ -325,7 +325,7 @@ islpci_interrupt(int irq, void *config)
/* Device has been initialized */ /* Device has been initialized */
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_TRACING, DEBUG(SHOW_TRACING,
"IRQ: Init flag, device initialized \n"); "IRQ: Init flag, device initialized\n");
#endif #endif
wake_up(&priv->reset_done); wake_up(&priv->reset_done);
} }
@@ -333,7 +333,7 @@ islpci_interrupt(int irq, void *config)
if (reg & ISL38XX_INT_IDENT_SLEEP) { if (reg & ISL38XX_INT_IDENT_SLEEP) {
/* Device intends to move to powersave state */ /* Device intends to move to powersave state */
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_TRACING, "IRQ: Sleep flag \n"); DEBUG(SHOW_TRACING, "IRQ: Sleep flag\n");
#endif #endif
isl38xx_handle_sleep_request(priv->control_block, isl38xx_handle_sleep_request(priv->control_block,
&powerstate, &powerstate,
@@ -343,7 +343,7 @@ islpci_interrupt(int irq, void *config)
if (reg & ISL38XX_INT_IDENT_WAKEUP) { if (reg & ISL38XX_INT_IDENT_WAKEUP) {
/* Device has been woken up to active state */ /* Device has been woken up to active state */
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_TRACING, "IRQ: Wakeup flag \n"); DEBUG(SHOW_TRACING, "IRQ: Wakeup flag\n");
#endif #endif
isl38xx_handle_wakeup(priv->control_block, isl38xx_handle_wakeup(priv->control_block,
@@ -634,7 +634,7 @@ islpci_alloc_memory(islpci_private *priv)
ioremap(pci_resource_start(priv->pdev, 0), ioremap(pci_resource_start(priv->pdev, 0),
ISL38XX_PCI_MEM_SIZE))) { ISL38XX_PCI_MEM_SIZE))) {
/* error in remapping the PCI device memory address range */ /* error in remapping the PCI device memory address range */
printk(KERN_ERR "PCI memory remapping failed \n"); printk(KERN_ERR "PCI memory remapping failed\n");
return -1; return -1;
} }
@@ -901,7 +901,7 @@ islpci_setup(struct pci_dev *pdev)
if (register_netdev(ndev)) { if (register_netdev(ndev)) {
DEBUG(SHOW_ERROR_MESSAGES, DEBUG(SHOW_ERROR_MESSAGES,
"ERROR: register_netdev() failed \n"); "ERROR: register_netdev() failed\n");
goto do_islpci_free_memory; goto do_islpci_free_memory;
} }

8
drivers/net/wireless/prism54/islpci_eth.c
View File

@@ -89,7 +89,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
u32 curr_frag; u32 curr_frag;
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_transmit \n"); DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_transmit\n");
#endif #endif
/* lock the driver code */ /* lock the driver code */
@@ -140,7 +140,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
} }
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_TRACING, "memmove %p %p %i \n", skb->data, DEBUG(SHOW_TRACING, "memmove %p %p %i\n", skb->data,
src, skb->len); src, skb->len);
#endif #endif
} else { } else {
@@ -319,7 +319,7 @@ islpci_eth_receive(islpci_private *priv)
int discard = 0; int discard = 0;
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_receive \n"); DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_receive\n");
#endif #endif
/* the device has written an Ethernet frame in the data area /* the device has written an Ethernet frame in the data area
@@ -431,7 +431,7 @@ islpci_eth_receive(islpci_private *priv)
skb = dev_alloc_skb(MAX_FRAGMENT_SIZE_RX + 2); skb = dev_alloc_skb(MAX_FRAGMENT_SIZE_RX + 2);
if (unlikely(skb == NULL)) { if (unlikely(skb == NULL)) {
/* error allocating an sk_buff structure elements */ /* error allocating an sk_buff structure elements */
DEBUG(SHOW_ERROR_MESSAGES, "Error allocating skb \n"); DEBUG(SHOW_ERROR_MESSAGES, "Error allocating skb\n");
break; break;
} }
skb_reserve(skb, (4 - (long) skb->data) & 0x03); skb_reserve(skb, (4 - (long) skb->data) & 0x03);

8
drivers/net/wireless/prism54/islpci_mgt.c
View File

@@ -113,7 +113,7 @@ islpci_mgmt_rx_fill(struct net_device *ndev)
u32 curr = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ]); u32 curr = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ]);
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgmt_rx_fill \n"); DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgmt_rx_fill\n");
#endif #endif
while (curr - priv->index_mgmt_rx < ISL38XX_CB_MGMT_QSIZE) { while (curr - priv->index_mgmt_rx < ISL38XX_CB_MGMT_QSIZE) {
@@ -211,7 +211,7 @@ islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid,
{ {
pimfor_header_t *h = buf.mem; pimfor_header_t *h = buf.mem;
DEBUG(SHOW_PIMFOR_FRAMES, DEBUG(SHOW_PIMFOR_FRAMES,
"PIMFOR: op %i, oid 0x%08lx, device %i, flags 0x%x length 0x%x \n", "PIMFOR: op %i, oid 0x%08lx, device %i, flags 0x%x length 0x%x\n",
h->operation, oid, h->device_id, h->flags, length); h->operation, oid, h->device_id, h->flags, length);
/* display the buffer contents for debugging */ /* display the buffer contents for debugging */
@@ -279,7 +279,7 @@ islpci_mgt_receive(struct net_device *ndev)
u32 curr_frag; u32 curr_frag;
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgt_receive \n"); DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgt_receive\n");
#endif #endif
/* Only once per interrupt, determine fragment range to /* Only once per interrupt, determine fragment range to
@@ -338,7 +338,7 @@ islpci_mgt_receive(struct net_device *ndev)
#if VERBOSE > SHOW_ERROR_MESSAGES #if VERBOSE > SHOW_ERROR_MESSAGES
DEBUG(SHOW_PIMFOR_FRAMES, DEBUG(SHOW_PIMFOR_FRAMES,
"PIMFOR: op %i, oid 0x%08x, device %i, flags 0x%x length 0x%x \n", "PIMFOR: op %i, oid 0x%08x, device %i, flags 0x%x length 0x%x\n",
header->operation, header->oid, header->device_id, header->operation, header->oid, header->device_id,
header->flags, header->length); header->flags, header->length);

2
drivers/net/wireless/prism54/oid_mgt.c
View File

@@ -819,7 +819,7 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str)
k = snprintf(str, PRIV_STR_SIZE, "nr=%u\n", list->nr); k = snprintf(str, PRIV_STR_SIZE, "nr=%u\n", list->nr);
for (i = 0; i < list->nr; i++) for (i = 0; i < list->nr; i++)
k += snprintf(str + k, PRIV_STR_SIZE - k, k += snprintf(str + k, PRIV_STR_SIZE - k,
"bss[%u] : \nage=%u\nchannel=%u\n" "bss[%u] :\nage=%u\nchannel=%u\n"
"capinfo=0x%X\nrates=0x%X\n" "capinfo=0x%X\nrates=0x%X\n"
"basic_rates=0x%X\n", "basic_rates=0x%X\n",
i, list->bsslist[i].age, i, list->bsslist[i].age,