aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/prism54
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/prism54')
-rw-r--r--drivers/net/wireless/prism54/islpci_dev.c16
-rw-r--r--drivers/net/wireless/prism54/islpci_eth.c8
-rw-r--r--drivers/net/wireless/prism54/islpci_mgt.c8
-rw-r--r--drivers/net/wireless/prism54/oid_mgt.c2
4 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index a3ba3539db02..7c82e432cca7 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -227,14 +227,14 @@ islpci_interrupt(int irq, void *config)
227 227
228#if VERBOSE > SHOW_ERROR_MESSAGES 228#if VERBOSE > SHOW_ERROR_MESSAGES
229 DEBUG(SHOW_FUNCTION_CALLS, 229 DEBUG(SHOW_FUNCTION_CALLS,
230 "IRQ: Identification register 0x%p 0x%x \n", device, reg); 230 "IRQ: Identification register 0x%p 0x%x\n", device, reg);
231#endif 231#endif
232 232
233 /* check for each bit in the register separately */ 233 /* check for each bit in the register separately */
234 if (reg & ISL38XX_INT_IDENT_UPDATE) { 234 if (reg & ISL38XX_INT_IDENT_UPDATE) {
235#if VERBOSE > SHOW_ERROR_MESSAGES 235#if VERBOSE > SHOW_ERROR_MESSAGES
236 /* Queue has been updated */ 236 /* Queue has been updated */
237 DEBUG(SHOW_TRACING, "IRQ: Update flag \n"); 237 DEBUG(SHOW_TRACING, "IRQ: Update flag\n");
238 238
239 DEBUG(SHOW_QUEUE_INDEXES, 239 DEBUG(SHOW_QUEUE_INDEXES,
240 "CB drv Qs: [%i][%i][%i][%i][%i][%i]\n", 240 "CB drv Qs: [%i][%i][%i][%i][%i][%i]\n",
@@ -300,7 +300,7 @@ islpci_interrupt(int irq, void *config)
300 ISL38XX_CB_RX_DATA_LQ) != 0) { 300 ISL38XX_CB_RX_DATA_LQ) != 0) {
301#if VERBOSE > SHOW_ERROR_MESSAGES 301#if VERBOSE > SHOW_ERROR_MESSAGES
302 DEBUG(SHOW_TRACING, 302 DEBUG(SHOW_TRACING,
303 "Received frame in Data Low Queue \n"); 303 "Received frame in Data Low Queue\n");
304#endif 304#endif
305 islpci_eth_receive(priv); 305 islpci_eth_receive(priv);
306 } 306 }
@@ -325,7 +325,7 @@ islpci_interrupt(int irq, void *config)
325 /* Device has been initialized */ 325 /* Device has been initialized */
326#if VERBOSE > SHOW_ERROR_MESSAGES 326#if VERBOSE > SHOW_ERROR_MESSAGES
327 DEBUG(SHOW_TRACING, 327 DEBUG(SHOW_TRACING,
328 "IRQ: Init flag, device initialized \n"); 328 "IRQ: Init flag, device initialized\n");
329#endif 329#endif
330 wake_up(&priv->reset_done); 330 wake_up(&priv->reset_done);
331 } 331 }
@@ -333,7 +333,7 @@ islpci_interrupt(int irq, void *config)
333 if (reg & ISL38XX_INT_IDENT_SLEEP) { 333 if (reg & ISL38XX_INT_IDENT_SLEEP) {
334 /* Device intends to move to powersave state */ 334 /* Device intends to move to powersave state */
335#if VERBOSE > SHOW_ERROR_MESSAGES 335#if VERBOSE > SHOW_ERROR_MESSAGES
336 DEBUG(SHOW_TRACING, "IRQ: Sleep flag \n"); 336 DEBUG(SHOW_TRACING, "IRQ: Sleep flag\n");
337#endif 337#endif
338 isl38xx_handle_sleep_request(priv->control_block, 338 isl38xx_handle_sleep_request(priv->control_block,
339 &powerstate, 339 &powerstate,
@@ -343,7 +343,7 @@ islpci_interrupt(int irq, void *config)
343 if (reg & ISL38XX_INT_IDENT_WAKEUP) { 343 if (reg & ISL38XX_INT_IDENT_WAKEUP) {
344 /* Device has been woken up to active state */ 344 /* Device has been woken up to active state */
345#if VERBOSE > SHOW_ERROR_MESSAGES 345#if VERBOSE > SHOW_ERROR_MESSAGES
346 DEBUG(SHOW_TRACING, "IRQ: Wakeup flag \n"); 346 DEBUG(SHOW_TRACING, "IRQ: Wakeup flag\n");
347#endif 347#endif
348 348
349 isl38xx_handle_wakeup(priv->control_block, 349 isl38xx_handle_wakeup(priv->control_block,
@@ -634,7 +634,7 @@ islpci_alloc_memory(islpci_private *priv)
634 ioremap(pci_resource_start(priv->pdev, 0), 634 ioremap(pci_resource_start(priv->pdev, 0),
635 ISL38XX_PCI_MEM_SIZE))) { 635 ISL38XX_PCI_MEM_SIZE))) {
636 /* error in remapping the PCI device memory address range */ 636 /* error in remapping the PCI device memory address range */
637 printk(KERN_ERR "PCI memory remapping failed \n"); 637 printk(KERN_ERR "PCI memory remapping failed\n");
638 return -1; 638 return -1;
639 } 639 }
640 640
@@ -901,7 +901,7 @@ islpci_setup(struct pci_dev *pdev)
901 901
902 if (register_netdev(ndev)) { 902 if (register_netdev(ndev)) {
903 DEBUG(SHOW_ERROR_MESSAGES, 903 DEBUG(SHOW_ERROR_MESSAGES,
904 "ERROR: register_netdev() failed \n"); 904 "ERROR: register_netdev() failed\n");
905 goto do_islpci_free_memory; 905 goto do_islpci_free_memory;
906 } 906 }
907 907
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index 872b64783e78..af9e7fbd7640 100644
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -89,7 +89,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
89 u32 curr_frag; 89 u32 curr_frag;
90 90
91#if VERBOSE > SHOW_ERROR_MESSAGES 91#if VERBOSE > SHOW_ERROR_MESSAGES
92 DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_transmit \n"); 92 DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_transmit\n");
93#endif 93#endif
94 94
95 /* lock the driver code */ 95 /* lock the driver code */
@@ -140,7 +140,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
140 } 140 }
141 141
142#if VERBOSE > SHOW_ERROR_MESSAGES 142#if VERBOSE > SHOW_ERROR_MESSAGES
143 DEBUG(SHOW_TRACING, "memmove %p %p %i \n", skb->data, 143 DEBUG(SHOW_TRACING, "memmove %p %p %i\n", skb->data,
144 src, skb->len); 144 src, skb->len);
145#endif 145#endif
146 } else { 146 } else {
@@ -319,7 +319,7 @@ islpci_eth_receive(islpci_private *priv)
319 int discard = 0; 319 int discard = 0;
320 320
321#if VERBOSE > SHOW_ERROR_MESSAGES 321#if VERBOSE > SHOW_ERROR_MESSAGES
322 DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_receive \n"); 322 DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_receive\n");
323#endif 323#endif
324 324
325 /* the device has written an Ethernet frame in the data area 325 /* the device has written an Ethernet frame in the data area
@@ -431,7 +431,7 @@ islpci_eth_receive(islpci_private *priv)
431 skb = dev_alloc_skb(MAX_FRAGMENT_SIZE_RX + 2); 431 skb = dev_alloc_skb(MAX_FRAGMENT_SIZE_RX + 2);
432 if (unlikely(skb == NULL)) { 432 if (unlikely(skb == NULL)) {
433 /* error allocating an sk_buff structure elements */ 433 /* error allocating an sk_buff structure elements */
434 DEBUG(SHOW_ERROR_MESSAGES, "Error allocating skb \n"); 434 DEBUG(SHOW_ERROR_MESSAGES, "Error allocating skb\n");
435 break; 435 break;
436 } 436 }
437 skb_reserve(skb, (4 - (long) skb->data) & 0x03); 437 skb_reserve(skb, (4 - (long) skb->data) & 0x03);
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index 69d2f882fd06..89b0278eb7e8 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -113,7 +113,7 @@ islpci_mgmt_rx_fill(struct net_device *ndev)
113 u32 curr = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ]); 113 u32 curr = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ]);
114 114
115#if VERBOSE > SHOW_ERROR_MESSAGES 115#if VERBOSE > SHOW_ERROR_MESSAGES
116 DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgmt_rx_fill \n"); 116 DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgmt_rx_fill\n");
117#endif 117#endif
118 118
119 while (curr - priv->index_mgmt_rx < ISL38XX_CB_MGMT_QSIZE) { 119 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,
211 { 211 {
212 pimfor_header_t *h = buf.mem; 212 pimfor_header_t *h = buf.mem;
213 DEBUG(SHOW_PIMFOR_FRAMES, 213 DEBUG(SHOW_PIMFOR_FRAMES,
214 "PIMFOR: op %i, oid 0x%08lx, device %i, flags 0x%x length 0x%x \n", 214 "PIMFOR: op %i, oid 0x%08lx, device %i, flags 0x%x length 0x%x\n",
215 h->operation, oid, h->device_id, h->flags, length); 215 h->operation, oid, h->device_id, h->flags, length);
216 216
217 /* display the buffer contents for debugging */ 217 /* display the buffer contents for debugging */
@@ -279,7 +279,7 @@ islpci_mgt_receive(struct net_device *ndev)
279 u32 curr_frag; 279 u32 curr_frag;
280 280
281#if VERBOSE > SHOW_ERROR_MESSAGES 281#if VERBOSE > SHOW_ERROR_MESSAGES
282 DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgt_receive \n"); 282 DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgt_receive\n");
283#endif 283#endif
284 284
285 /* Only once per interrupt, determine fragment range to 285 /* Only once per interrupt, determine fragment range to
@@ -338,7 +338,7 @@ islpci_mgt_receive(struct net_device *ndev)
338 338
339#if VERBOSE > SHOW_ERROR_MESSAGES 339#if VERBOSE > SHOW_ERROR_MESSAGES
340 DEBUG(SHOW_PIMFOR_FRAMES, 340 DEBUG(SHOW_PIMFOR_FRAMES,
341 "PIMFOR: op %i, oid 0x%08x, device %i, flags 0x%x length 0x%x \n", 341 "PIMFOR: op %i, oid 0x%08x, device %i, flags 0x%x length 0x%x\n",
342 header->operation, header->oid, header->device_id, 342 header->operation, header->oid, header->device_id,
343 header->flags, header->length); 343 header->flags, header->length);
344 344
diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c
index 1187e6112a64..07df70a10071 100644
--- a/drivers/net/wireless/prism54/oid_mgt.c
+++ b/drivers/net/wireless/prism54/oid_mgt.c
@@ -819,7 +819,7 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str)
819 k = snprintf(str, PRIV_STR_SIZE, "nr=%u\n", list->nr); 819 k = snprintf(str, PRIV_STR_SIZE, "nr=%u\n", list->nr);
820 for (i = 0; i < list->nr; i++) 820 for (i = 0; i < list->nr; i++)
821 k += snprintf(str + k, PRIV_STR_SIZE - k, 821 k += snprintf(str + k, PRIV_STR_SIZE - k,
822 "bss[%u] : \nage=%u\nchannel=%u\n" 822 "bss[%u] :\nage=%u\nchannel=%u\n"
823 "capinfo=0x%X\nrates=0x%X\n" 823 "capinfo=0x%X\nrates=0x%X\n"
824 "basic_rates=0x%X\n", 824 "basic_rates=0x%X\n",
825 i, list->bsslist[i].age, 825 i, list->bsslist[i].age,