6 files changed, 47 insertions, 47 deletions

diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h
index 4801a363507b..10df07de9e52 100644
--- a/drivers/net/wireless/p54/p54.h
+++ b/drivers/net/wireless/p54/p54.h
@@ -1,5 +1,5 @@
-#ifndef PRISM54_H
-#define PRISM54_H
+#ifndef P54_H
+#define P54_H
 
 /*
  * Shared defines for all mac80211 Prism54 code
@@ -76,4 +76,4 @@ void p54_fill_eeprom_readback(struct p54_control_hdr *hdr);
 struct ieee80211_hw *p54_init_common(size_t priv_data_len);
 void p54_free_common(struct ieee80211_hw *dev);
 
-#endif /* PRISM54_H */
+#endif /* P54_H */
diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h
index 8db6c0e8e540..9bc2a1cf4b57 100644
--- a/drivers/net/wireless/p54/p54common.h
+++ b/drivers/net/wireless/p54/p54common.h
@@ -1,5 +1,5 @@
-#ifndef PRISM54COMMON_H
-#define PRISM54COMMON_H
+#ifndef P54COMMON_H
+#define P54COMMON_H
 
 /*
  * Common code specific definitions for mac80211 Prism54 drivers
@@ -250,4 +250,4 @@ struct p54_tx_control_vdcf {
         __le16 frameburst;
 } __attribute__ ((packed));
 
-#endif /* PRISM54COMMON_H */
+#endif /* P54COMMON_H */
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 7dd4add4bf4e..ea2dc3d93c4d 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -75,7 +75,7 @@ static int p54p_upload_firmware(struct ieee80211_hw *dev)
 
         err = request_firmware(&fw_entry, "isl3886", &priv->pdev->dev);
         if (err) {
-                printk(KERN_ERR "%s (prism54pci): cannot find firmware "
+                printk(KERN_ERR "%s (p54pci): cannot find firmware "
                        "(isl3886)\n", pci_name(priv->pdev));
                 return err;
         }
@@ -150,16 +150,16 @@ static int p54p_read_eeprom(struct ieee80211_hw *dev)
 
         init_completion(&priv->boot_comp);
         err = request_irq(priv->pdev->irq, &p54p_simple_interrupt,
-                          IRQF_SHARED, "prism54pci", priv);
+                          IRQF_SHARED, "p54pci", priv);
         if (err) {
-                printk(KERN_ERR "%s (prism54pci): failed to register IRQ handler\n",
+                printk(KERN_ERR "%s (p54pci): failed to register IRQ handler\n",
                        pci_name(priv->pdev));
                 return err;
         }
 
         eeprom = kmalloc(0x2010 + EEPROM_READBACK_LEN, GFP_KERNEL);
         if (!eeprom) {
-                printk(KERN_ERR "%s (prism54pci): no memory for eeprom!\n",
+                printk(KERN_ERR "%s (p54pci): no memory for eeprom!\n",
                        pci_name(priv->pdev));
                 err = -ENOMEM;
                 goto out;
@@ -177,7 +177,7 @@ static int p54p_read_eeprom(struct ieee80211_hw *dev)
         P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));
 
         if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
-                printk(KERN_ERR "%s (prism54pci): Cannot boot firmware!\n",
+                printk(KERN_ERR "%s (p54pci): Cannot boot firmware!\n",
                        pci_name(priv->pdev));
                 err = -EINVAL;
                 goto out;
@@ -219,7 +219,7 @@ static int p54p_read_eeprom(struct ieee80211_hw *dev)
         alen = le16_to_cpu(ring_control->rx_mgmt[0].len);
         if (le32_to_cpu(ring_control->device_idx[2]) != 1 ||
             alen < 0x10) {
-                printk(KERN_ERR "%s (prism54pci): Cannot read eeprom!\n",
+                printk(KERN_ERR "%s (p54pci): Cannot read eeprom!\n",
                        pci_name(priv->pdev));
                 err = -EINVAL;
                 goto out;
@@ -412,7 +412,7 @@ static int p54p_open(struct ieee80211_hw *dev)
 
         init_completion(&priv->boot_comp);
         err = request_irq(priv->pdev->irq, &p54p_interrupt,
-                          IRQF_SHARED, "prism54pci", dev);
+                          IRQF_SHARED, "p54pci", dev);
         if (err) {
                 printk(KERN_ERR "%s: failed to register IRQ handler\n",
                        wiphy_name(dev->wiphy));
@@ -506,7 +506,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
 
         err = pci_enable_device(pdev);
         if (err) {
-                printk(KERN_ERR "%s (prism54pci): Cannot enable new PCI device\n",
+                printk(KERN_ERR "%s (p54pci): Cannot enable new PCI device\n",
                        pci_name(pdev));
                 return err;
         }
@@ -514,22 +514,22 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
         mem_addr = pci_resource_start(pdev, 0);
         mem_len = pci_resource_len(pdev, 0);
         if (mem_len < sizeof(struct p54p_csr)) {
-                printk(KERN_ERR "%s (prism54pci): Too short PCI resources\n",
+                printk(KERN_ERR "%s (p54pci): Too short PCI resources\n",
                        pci_name(pdev));
                 pci_disable_device(pdev);
                 return err;
         }
 
-        err = pci_request_regions(pdev, "prism54pci");
+        err = pci_request_regions(pdev, "p54pci");
         if (err) {
-                printk(KERN_ERR "%s (prism54pci): Cannot obtain PCI resources\n",
+                printk(KERN_ERR "%s (p54pci): Cannot obtain PCI resources\n",
                        pci_name(pdev));
                 return err;
         }
 
         if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) ||
             pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) {
-                printk(KERN_ERR "%s (prism54pci): No suitable DMA available\n",
+                printk(KERN_ERR "%s (p54pci): No suitable DMA available\n",
                        pci_name(pdev));
                 goto err_free_reg;
         }
@@ -542,7 +542,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
 
         dev = p54_init_common(sizeof(*priv));
         if (!dev) {
-                printk(KERN_ERR "%s (prism54pci): ieee80211 alloc failed\n",
+                printk(KERN_ERR "%s (p54pci): ieee80211 alloc failed\n",
                        pci_name(pdev));
                 err = -ENOMEM;
                 goto err_free_reg;
@@ -556,7 +556,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
 
         priv->map = ioremap(mem_addr, mem_len);
         if (!priv->map) {
-                printk(KERN_ERR "%s (prism54pci): Cannot map device memory\n",
+                printk(KERN_ERR "%s (p54pci): Cannot map device memory\n",
                        pci_name(pdev));
                 err = -EINVAL;  // TODO: use a better error code?
                 goto err_free_dev;
@@ -565,7 +565,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
         priv->ring_control = pci_alloc_consistent(pdev, sizeof(*priv->ring_control),
                                                   &priv->ring_control_dma);
         if (!priv->ring_control) {
-                printk(KERN_ERR "%s (prism54pci): Cannot allocate rings\n",
+                printk(KERN_ERR "%s (p54pci): Cannot allocate rings\n",
                        pci_name(pdev));
                 err = -ENOMEM;
                 goto err_iounmap;
@@ -588,7 +588,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
 
         err = ieee80211_register_hw(dev);
         if (err) {
-                printk(KERN_ERR "%s (prism54pci): Cannot register netdevice\n",
+                printk(KERN_ERR "%s (p54pci): Cannot register netdevice\n",
                        pci_name(pdev));
                 goto err_free_common;
         }
@@ -673,7 +673,7 @@ static int p54p_resume(struct pci_dev *pdev)
 #endif /* CONFIG_PM */
 
 static struct pci_driver p54p_driver = {
-        .name           = "prism54pci",
+        .name           = "p54pci",
         .id_table       = p54p_table,
         .probe          = p54p_probe,
         .remove         = __devexit_p(p54p_remove),
diff --git a/drivers/net/wireless/p54/p54pci.h b/drivers/net/wireless/p54/p54pci.h
index 5bedd7af385d..07678ef5ddc8 100644
--- a/drivers/net/wireless/p54/p54pci.h
+++ b/drivers/net/wireless/p54/p54pci.h
@@ -1,5 +1,5 @@
-#ifndef PRISM54PCI_H
-#define PRISM54PCI_H
+#ifndef P54PCI_H
+#define P54PCI_H
 
 /*
  * Defines for PCI based mac80211 Prism54 driver
@@ -68,7 +68,7 @@ struct p54p_csr {
 } __attribute__ ((packed));
 
 /* usb backend only needs the register defines above */
-#ifndef PRISM54USB_H
+#ifndef P54USB_H
 struct p54p_desc {
         __le32 host_addr;
         __le32 device_addr;
@@ -102,5 +102,5 @@ struct p54p_priv {
         struct completion boot_comp;
 };
 
-#endif /* PRISM54USB_H */
-#endif /* PRISM54PCI_H */
+#endif /* P54USB_H */
+#endif /* P54PCI_H */
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index cbaca23a9453..8a420df605af 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -322,7 +322,7 @@ static int p54u_read_eeprom(struct ieee80211_hw *dev)
 
         buf = kmalloc(0x2020, GFP_KERNEL);
         if (!buf) {
-                printk(KERN_ERR "prism54usb: cannot allocate memory for "
+                printk(KERN_ERR "p54usb: cannot allocate memory for "
                        "eeprom readback!\n");
                 return -ENOMEM;
         }
@@ -331,7 +331,7 @@ static int p54u_read_eeprom(struct ieee80211_hw *dev)
                 *((u32 *) buf) = priv->common.rx_start;
                 err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf, sizeof(u32));
                 if (err) {
-                        printk(KERN_ERR "prism54usb: addr send failed\n");
+                        printk(KERN_ERR "p54usb: addr send failed\n");
                         goto fail;
                 }
         } else {
@@ -341,7 +341,7 @@ static int p54u_read_eeprom(struct ieee80211_hw *dev)
                 reg->val = cpu_to_le32(ISL38XX_DEV_INT_DATA);
                 err = p54u_bulk_msg(priv, P54U_PIPE_DEV, buf, sizeof(*reg));
                 if (err) {
-                        printk(KERN_ERR "prism54usb: dev_int send failed\n");
+                        printk(KERN_ERR "p54usb: dev_int send failed\n");
                         goto fail;
                 }
         }
@@ -359,7 +359,7 @@ static int p54u_read_eeprom(struct ieee80211_hw *dev)
         err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf,
                             EEPROM_READBACK_LEN + priv->common.tx_hdr_len);
         if (err) {
-                printk(KERN_ERR "prism54usb: eeprom req send failed\n");
+                printk(KERN_ERR "p54usb: eeprom req send failed\n");
                 goto fail;
         }
 
@@ -369,7 +369,7 @@ static int p54u_read_eeprom(struct ieee80211_hw *dev)
         if (!err && alen > offset) {
                 p54_parse_eeprom(dev, (u8 *)buf + offset, alen - offset);
         } else {
-                printk(KERN_ERR "prism54usb: eeprom read failed!\n");
+                printk(KERN_ERR "p54usb: eeprom read failed!\n");
                 err = -EINVAL;
                 goto fail;
         }
@@ -458,7 +458,7 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)
 
                 err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf, block_size);
                 if (err) {
-                        printk(KERN_ERR "prism54usb: firmware upload failed!\n");
+                        printk(KERN_ERR "p54usb: firmware upload failed!\n");
                         goto err_upload_failed;
                 }
 
@@ -469,7 +469,7 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)
         *((__le32 *)buf) = cpu_to_le32(~crc32_le(~0, fw_entry->data, fw_entry->size));
         err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf, sizeof(u32));
         if (err) {
-                printk(KERN_ERR "prism54usb: firmware upload failed!\n");
+                printk(KERN_ERR "p54usb: firmware upload failed!\n");
                 goto err_upload_failed;
         }
 
@@ -480,13 +480,13 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)
                         break;
 
                 if (alen > 5 && !memcmp(buf, "ERROR", 5)) {
-                        printk(KERN_INFO "prism54usb: firmware upload failed!\n");
+                        printk(KERN_INFO "p54usb: firmware upload failed!\n");
                         err = -EINVAL;
                         break;
                 }
 
                 if (time_after(jiffies, timeout)) {
-                        printk(KERN_ERR "prism54usb: firmware boot timed out!\n");
+                        printk(KERN_ERR "p54usb: firmware boot timed out!\n");
                         err = -ETIMEDOUT;
                         break;
                 }
@@ -498,7 +498,7 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)
         buf[1] = '\r';
         err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf, 2);
         if (err) {
-                printk(KERN_ERR "prism54usb: firmware boot failed!\n");
+                printk(KERN_ERR "p54usb: firmware boot failed!\n");
                 goto err_upload_failed;
         }
 
@@ -660,7 +660,7 @@ static int p54u_upload_firmware_net2280(struct ieee80211_hw *dev)
 
                 err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf, block_len);
                 if (err) {
-                        printk(KERN_ERR "prism54usb: firmware block upload "
+                        printk(KERN_ERR "p54usb: firmware block upload "
                                "failed\n");
                         goto fail;
                 }
@@ -694,7 +694,7 @@ static int p54u_upload_firmware_net2280(struct ieee80211_hw *dev)
                           0x002C | (unsigned long)&devreg->direct_mem_win);
                 if (!(reg & cpu_to_le32(ISL38XX_DMA_STATUS_DONE)) ||
                     !(reg & cpu_to_le32(ISL38XX_DMA_STATUS_READY))) {
-                        printk(KERN_ERR "prism54usb: firmware DMA transfer "
+                        printk(KERN_ERR "p54usb: firmware DMA transfer "
                                "failed\n");
                         goto fail;
                 }
@@ -802,7 +802,7 @@ static int __devinit p54u_probe(struct usb_interface *intf,
 
         dev = p54_init_common(sizeof(*priv));
         if (!dev) {
-                printk(KERN_ERR "prism54usb: ieee80211 alloc failed\n");
+                printk(KERN_ERR "p54usb: ieee80211 alloc failed\n");
                 return -ENOMEM;
         }
 
@@ -858,7 +858,7 @@ static int __devinit p54u_probe(struct usb_interface *intf,
         if (!is_valid_ether_addr(dev->wiphy->perm_addr)) {
                 u8 perm_addr[ETH_ALEN];
 
-                printk(KERN_WARNING "prism54usb: Invalid hwaddr! Using randomly generated MAC addr\n");
+                printk(KERN_WARNING "p54usb: Invalid hwaddr! Using randomly generated MAC addr\n");
                 random_ether_addr(perm_addr);
                 SET_IEEE80211_PERM_ADDR(dev, perm_addr);
         }
@@ -867,7 +867,7 @@ static int __devinit p54u_probe(struct usb_interface *intf,
 
         err = ieee80211_register_hw(dev);
         if (err) {
-                printk(KERN_ERR "prism54usb: Cannot register netdevice\n");
+                printk(KERN_ERR "p54usb: Cannot register netdevice\n");
                 goto err_free_dev;
         }
 
@@ -902,7 +902,7 @@ static void __devexit p54u_disconnect(struct usb_interface *intf)
 }
 
 static struct usb_driver p54u_driver = {
-        .name   = "prism54usb",
+        .name   = "p54usb",
         .id_table = p54u_table,
         .probe = p54u_probe,
         .disconnect = p54u_disconnect,
diff --git a/drivers/net/wireless/p54/p54usb.h b/drivers/net/wireless/p54/p54usb.h
index d1896b396c1c..1baaff058c5a 100644
--- a/drivers/net/wireless/p54/p54usb.h
+++ b/drivers/net/wireless/p54/p54usb.h
@@ -1,5 +1,5 @@
-#ifndef PRISM54USB_H
-#define PRISM54USB_H
+#ifndef P54USB_H
+#define P54USB_H
 
 /*
  * Defines for USB based mac80211 Prism54 driver
@@ -130,4 +130,4 @@ struct p54u_priv {
         struct sk_buff_head rx_queue;
 };
 
-#endif /* PRISM54USB_H */
+#endif /* P54USB_H */