This standardizes logging prefixes to "bcm_wimax: ". Move #define pr_fmt to headers.h Remove prefixes from pr_<level> uses. Convert printks to pr_<level>.
Signed-off-by: Joe Perches <[email protected]> --- drivers/staging/bcm/Bcmchar.c | 15 +++++------- drivers/staging/bcm/Bcmnet.c | 16 ++++++------ drivers/staging/bcm/CmHost.c | 3 +- drivers/staging/bcm/DDRInit.c | 2 - drivers/staging/bcm/InterfaceDld.c | 2 - drivers/staging/bcm/InterfaceIdleMode.c | 2 - drivers/staging/bcm/InterfaceInit.c | 20 +++++++--------- drivers/staging/bcm/InterfaceIsr.c | 2 +- drivers/staging/bcm/InterfaceMisc.c | 2 - drivers/staging/bcm/InterfaceRx.c | 6 +--- drivers/staging/bcm/InterfaceTx.c | 4 +-- drivers/staging/bcm/Misc.c | 38 ++++++++++++++---------------- drivers/staging/bcm/PHSModule.c | 2 - drivers/staging/bcm/Qos.c | 2 +- drivers/staging/bcm/Transmit.c | 6 ++-- drivers/staging/bcm/headers.h | 2 + drivers/staging/bcm/nvm.c | 10 +++----- 17 files changed, 56 insertions(+), 78 deletions(-) diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 922d177..bc653aa 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -1,7 +1,3 @@ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -#include <linux/fs.h> - #include "headers.h" /*************************************************************** * Function - bcm_char_open() @@ -797,7 +793,8 @@ cntrlEnd: netif_stop_queue(Adapter->dev); Status = reset_card_proc(Adapter); if (Status) { - pr_err(PFX "%s: reset_card_proc Failed!\n", Adapter->dev->name); + pr_err("%s: reset_card_proc Failed!\n", + Adapter->dev->name); up(&Adapter->fw_download_sema); up(&Adapter->NVMRdmWrmLock); return Status; @@ -957,7 +954,7 @@ cntrlEnd: case IOCTL_CHIP_RESET: { INT NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock); if (NVMAccess) { - pr_info(" IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n"); + pr_info("IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n"); return -EACCES; } @@ -2093,7 +2090,7 @@ cntrlEnd: break; default: - pr_info(DRV_NAME ": unknown ioctl cmd=%#x\n", cmd); + pr_info("unknown ioctl cmd=%#x\n", cmd); Status = STATUS_FAILURE; break; } @@ -2118,7 +2115,7 @@ int register_control_device_interface(PMINI_ADAPTER Adapter) Adapter->major = register_chrdev(0, DEV_NAME, &bcm_fops); if (Adapter->major < 0) { - pr_err(DRV_NAME ": could not created character device\n"); + pr_err("could not created character device\n"); return Adapter->major; } @@ -2127,7 +2124,7 @@ int register_control_device_interface(PMINI_ADAPTER Adapter) Adapter, DEV_NAME); if (IS_ERR(Adapter->pstCreatedClassDevice)) { - pr_err(DRV_NAME ": class device create failed\n"); + pr_err("class device create failed\n"); unregister_chrdev(Adapter->major, DEV_NAME); return PTR_ERR(Adapter->pstCreatedClassDevice); } diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c index 133e146..6cf1b47 100644 --- a/drivers/staging/bcm/Bcmnet.c +++ b/drivers/staging/bcm/Bcmnet.c @@ -7,17 +7,17 @@ static INT bcm_open(struct net_device *dev) PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev); if (Adapter->fw_download_done == FALSE) { - pr_notice(PFX "%s: link up failed (download in progress)\n", + pr_notice("%s: link up failed (download in progress)\n", dev->name); return -EBUSY; } if (netif_msg_ifup(Adapter)) - pr_info(PFX "%s: enabling interface\n", dev->name); + pr_info("%s: enabling interface\n", dev->name); if (Adapter->LinkUpStatus) { if (netif_msg_link(Adapter)) - pr_info(PFX "%s: link up\n", dev->name); + pr_info("%s: link up\n", dev->name); netif_carrier_on(Adapter->dev); netif_start_queue(Adapter->dev); @@ -31,7 +31,7 @@ static INT bcm_close(struct net_device *dev) PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev); if (netif_msg_ifdown(Adapter)) - pr_info(PFX "%s: disabling interface\n", dev->name); + pr_info("%s: disabling interface\n", dev->name); netif_carrier_off(dev); netif_stop_queue(dev); @@ -78,7 +78,7 @@ static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev) /* Now Enqueue the packet */ if (netif_msg_tx_queued(Adapter)) - pr_info(PFX "%s: enqueueing packet to queue %d\n", + pr_info("%s: enqueueing packet to queue %d\n", dev->name, qindex); spin_lock(&Adapter->PackInfo[qindex].SFQueueLock); @@ -206,7 +206,7 @@ int register_networkdev(PMINI_ADAPTER Adapter) result = ReadMacAddressFromNVM(Adapter); if (result != STATUS_SUCCESS) { dev_err(&udev->dev, - PFX "Error in Reading the mac Address: %d", result); + "Error in Reading the mac Address: %d\n", result); return -EIO; } @@ -217,7 +217,7 @@ int register_networkdev(PMINI_ADAPTER Adapter) gblpnetdev = Adapter->dev; if (netif_msg_probe(Adapter)) - dev_info(&udev->dev, PFX "%s: register usb-%s-%s %pM\n", + dev_info(&udev->dev, "%s: register usb-%s-%s %pM\n", net->name, xdev->bus->bus_name, xdev->devpath, net->dev_addr); @@ -232,7 +232,7 @@ void unregister_networkdev(PMINI_ADAPTER Adapter) struct usb_device *xdev = IntfAdapter->udev; if (netif_msg_probe(Adapter)) - dev_info(&udev->dev, PFX "%s: unregister usb-%s%s\n", + dev_info(&udev->dev, "%s: unregister usb-%s%s\n", net->name, xdev->bus->bus_name, xdev->devpath); unregister_netdev(Adapter->dev); diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index bacbd59..260abff 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c @@ -5,7 +5,6 @@ ************************************************************/ //#define CONN_MSG -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include "headers.h" @@ -2415,7 +2414,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap netif_start_queue(Adapter->dev); Adapter->LinkUpStatus = 1; if (netif_msg_link(Adapter)) - pr_info(PFX "%s: link up\n", Adapter->dev->name); + pr_info("%s: link up\n", Adapter->dev->name); atomic_set(&Adapter->TxPktAvail, 1); wake_up(&Adapter->tx_packet_wait_queue); Adapter->liTimeSinceLastNetEntry = get_seconds(); diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c index d9f1901..26ec2b1 100644 --- a/drivers/staging/bcm/DDRInit.c +++ b/drivers/staging/bcm/DDRInit.c @@ -1,5 +1,3 @@ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "headers.h" diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c index 20b7fc8..62a5d63 100644 --- a/drivers/staging/bcm/InterfaceDld.c +++ b/drivers/staging/bcm/InterfaceDld.c @@ -1,5 +1,3 @@ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "headers.h" int InterfaceFileDownload(PVOID arg, struct file *flp, unsigned int on_chip_loc) diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c index b5c44f0..8cc9298 100644 --- a/drivers/staging/bcm/InterfaceIdleMode.c +++ b/drivers/staging/bcm/InterfaceIdleMode.c @@ -1,5 +1,3 @@ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "headers.h" /* diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c index 56a66a7c..01100f2 100644 --- a/drivers/staging/bcm/InterfaceInit.c +++ b/drivers/staging/bcm/InterfaceInit.c @@ -1,5 +1,3 @@ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "headers.h" static struct usb_device_id InterfaceUsbtable[] = { @@ -152,7 +150,7 @@ static int usbbcm_device_probe(struct usb_interface *intf, const struct usb_devi /* Reserve one extra queue for the bit-bucket */ ndev = alloc_etherdev_mq(sizeof(MINI_ADAPTER), NO_OF_QUEUES+1); if (ndev == NULL) { - dev_err(&udev->dev, DRV_NAME ": no memory for device\n"); + dev_err(&udev->dev, "no memory for device\n"); return -ENOMEM; } @@ -184,7 +182,7 @@ static int usbbcm_device_probe(struct usb_interface *intf, const struct usb_devi retval = InitAdapter(psAdapter); if (retval) { - dev_err(&udev->dev, DRV_NAME ": InitAdapter Failed\n"); + dev_err(&udev->dev, "InitAdapter Failed\n"); AdapterFree(psAdapter); return retval; } @@ -192,7 +190,7 @@ static int usbbcm_device_probe(struct usb_interface *intf, const struct usb_devi /* Allocate interface adapter structure */ psIntfAdapter = kzalloc(sizeof(S_INTERFACE_ADAPTER), GFP_KERNEL); if (psIntfAdapter == NULL) { - dev_err(&udev->dev, DRV_NAME ": no memory for Interface adapter\n"); + dev_err(&udev->dev, "no memory for Interface adapter\n"); AdapterFree(psAdapter); return -ENOMEM; } @@ -316,7 +314,7 @@ static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter) status = InitCardAndDownloadFirmware(psIntfAdapter->psAdapter); if (status != STATUS_SUCCESS) { - pr_err(DRV_NAME "InitCardAndDownloadFirmware failed.\n"); + pr_err("InitCardAndDownloadFirmware failed\n"); return status; } if (TRUE == psIntfAdapter->psAdapter->fw_download_done) { @@ -334,10 +332,10 @@ static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter) psIntfAdapter->psAdapter->waiting_to_fw_download_done, 5*HZ); if (value == 0) - pr_err(DRV_NAME ": Timeout waiting for mailbox interrupt.\n"); + pr_err("Timeout waiting for mailbox interrupt\n"); if (register_control_device_interface(psIntfAdapter->psAdapter) < 0) { - pr_err(DRV_NAME ": Register Control Device failed.\n"); + pr_err("Register Control Device failed\n"); return -EIO; } } @@ -667,12 +665,12 @@ struct class *bcm_class; static __init int bcm_init(void) { - printk(KERN_INFO "%s: %s, %s\n", DRV_NAME, DRV_DESCRIPTION, DRV_VERSION); - printk(KERN_INFO "%s\n", DRV_COPYRIGHT); + pr_info("%s, %s\n", DRV_DESCRIPTION, DRV_VERSION); + pr_info("%s\n", DRV_COPYRIGHT); bcm_class = class_create(THIS_MODULE, DRV_NAME); if (IS_ERR(bcm_class)) { - printk(KERN_ERR DRV_NAME ": could not create class\n"); + pr_err("could not create class\n"); return PTR_ERR(bcm_class); } diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c index 5545cbc..007d736 100644 --- a/drivers/staging/bcm/InterfaceIsr.c +++ b/drivers/staging/bcm/InterfaceIsr.c @@ -8,7 +8,7 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter ; if (netif_msg_intr(Adapter)) - pr_info(PFX "%s: interrupt status %d\n", + pr_info("%s: interrupt status %d\n", Adapter->dev->name, status); if(Adapter->device_removed == TRUE) diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c index 40d6c34..5c15dde 100644 --- a/drivers/staging/bcm/InterfaceMisc.c +++ b/drivers/staging/bcm/InterfaceMisc.c @@ -1,5 +1,3 @@ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "headers.h" INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter, diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c index c4644b3..9124c49 100644 --- a/drivers/staging/bcm/InterfaceRx.c +++ b/drivers/staging/bcm/InterfaceRx.c @@ -1,5 +1,3 @@ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "headers.h" static int SearchVcid(PMINI_ADAPTER Adapter,unsigned short usVcid) @@ -52,7 +50,7 @@ static void read_bulk_callback(struct urb *urb) PLEADER pLeader = urb->transfer_buffer; if (unlikely(netif_msg_rx_status(Adapter))) - pr_info(PFX "%s: rx urb status %d length %d\n", + pr_info("%s: rx urb status %d length %d\n", Adapter->dev->name, urb->status, urb->actual_length); if((Adapter->device_removed == TRUE) || @@ -105,7 +103,7 @@ static void read_bulk_callback(struct urb *urb) if(MAX_CNTL_PKT_SIZE < pLeader->PLength) { if (netif_msg_rx_err(Adapter)) - pr_info(PFX "%s: corrupted leader length...%d\n", + pr_info("%s: corrupted leader length...%d\n", Adapter->dev->name, pLeader->PLength); ++Adapter->dev->stats.rx_dropped; atomic_dec(&psIntfAdapter->uNumRcbUsed); diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c index a940d95..ce82366 100644 --- a/drivers/staging/bcm/InterfaceTx.c +++ b/drivers/staging/bcm/InterfaceTx.c @@ -1,5 +1,3 @@ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "headers.h" /*this is transmit call-back(BULK OUT)*/ @@ -13,7 +11,7 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/) PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); if (unlikely(netif_msg_tx_done(Adapter))) - pr_info(PFX "%s: transmit status %d\n", Adapter->dev->name, urb->status); + pr_info("%s: transmit status %d\n", Adapter->dev->name, urb->status); if(urb->status != STATUS_SUCCESS) { diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c index accb389..bfa0e68 100644 --- a/drivers/staging/bcm/Misc.c +++ b/drivers/staging/bcm/Misc.c @@ -1,5 +1,3 @@ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "headers.h" static int BcmFileDownload(PMINI_ADAPTER Adapter, const char *path, unsigned int loc); @@ -152,7 +150,7 @@ static int create_worker_threads(PMINI_ADAPTER psAdapter) psAdapter->control_packet_handler = kthread_run((int (*)(void *)) control_packet_handler, psAdapter, "%s-rx", DRV_NAME); if (IS_ERR(psAdapter->control_packet_handler)) { - pr_notice(DRV_NAME ": could not create control thread\n"); + pr_notice("could not create control thread\n"); return PTR_ERR(psAdapter->control_packet_handler); } @@ -160,7 +158,7 @@ static int create_worker_threads(PMINI_ADAPTER psAdapter) psAdapter->transmit_packet_thread = kthread_run((int (*)(void *)) tx_pkt_handler, psAdapter, "%s-tx", DRV_NAME); if (IS_ERR(psAdapter->transmit_packet_thread)) { - pr_notice(DRV_NAME ": could not creat transmit thread\n"); + pr_notice("could not creat transmit thread\n"); kthread_stop(psAdapter->control_packet_handler); return PTR_ERR(psAdapter->transmit_packet_thread); } @@ -176,7 +174,7 @@ static struct file *open_firmware_file(PMINI_ADAPTER Adapter, const char *path) flp = filp_open(path, O_RDONLY, S_IRWXU); set_fs(oldfs); if (IS_ERR(flp)) { - pr_err(DRV_NAME "Unable To Open File %s, err %ld", path, PTR_ERR(flp)); + pr_err("Unable To Open File %s, err %ld\n", path, PTR_ERR(flp)); flp = NULL; } @@ -1001,7 +999,7 @@ int reset_card_proc(PMINI_ADAPTER ps_adapter) Bcm_kill_all_URBs(psIntfAdapter); /* Reset the UMA-B Device */ if (ps_adapter->chip_id >= T3LPB) { - pr_info("Reseting UMA-B\n"); + pr_info("Resetting UMA-B\n"); retval = usb_reset_device(psIntfAdapter->udev); psIntfAdapter->psAdapter->StopAllXaction = FALSE; @@ -1153,7 +1151,7 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter) BcmInitNVM(ps_adapter); status = ddr_init(ps_adapter); if (status) { - pr_err(DRV_NAME "ddr_init Failed\n"); + pr_err("ddr_init Failed\n"); return status; } @@ -1312,47 +1310,47 @@ void beceem_parse_target_struct(PMINI_ADAPTER Adapter) UINT uiHostDrvrCfg6 = 0, uiEEPROMFlag = 0; if (ntohl(Adapter->pstargetparams->m_u32PhyParameter2) & AUTO_SYNC_DISABLE) { - pr_info(DRV_NAME ": AutoSyncup is Disabled\n"); + pr_info("AutoSyncup is Disabled\n"); Adapter->AutoSyncup = FALSE; } else { - pr_info(DRV_NAME ": AutoSyncup is Enabled\n"); + pr_info("AutoSyncup is Enabled\n"); Adapter->AutoSyncup = TRUE; } if (ntohl(Adapter->pstargetparams->HostDrvrConfig6) & AUTO_LINKUP_ENABLE) { - pr_info(DRV_NAME ": Enabling autolink up"); + pr_info("Enabling autolink up\n"); Adapter->AutoLinkUp = TRUE; } else { - pr_info(DRV_NAME ": Disabling autolink up"); + pr_info("Disabling autolink up\n"); Adapter->AutoLinkUp = FALSE; } /* Setting the DDR Setting.. */ Adapter->DDRSetting = (ntohl(Adapter->pstargetparams->HostDrvrConfig6) >> 8)&0x0F; Adapter->ulPowerSaveMode = (ntohl(Adapter->pstargetparams->HostDrvrConfig6)>>12)&0x0F; - pr_info(DRV_NAME ": DDR Setting: %x\n", Adapter->DDRSetting); - pr_info(DRV_NAME ": Power Save Mode: %lx\n", Adapter->ulPowerSaveMode); + pr_info("DDR Setting: %x\n", Adapter->DDRSetting); + pr_info("Power Save Mode: %lx\n", Adapter->ulPowerSaveMode); if (ntohl(Adapter->pstargetparams->HostDrvrConfig6) & AUTO_FIRM_DOWNLOAD) { - pr_info(DRV_NAME ": Enabling Auto Firmware Download\n"); + pr_info("Enabling Auto Firmware Download\n"); Adapter->AutoFirmDld = TRUE; } else { - pr_info(DRV_NAME ": Disabling Auto Firmware Download\n"); + pr_info("Disabling Auto Firmware Download\n"); Adapter->AutoFirmDld = FALSE; } uiHostDrvrCfg6 = ntohl(Adapter->pstargetparams->HostDrvrConfig6); Adapter->bMipsConfig = (uiHostDrvrCfg6>>20)&0x01; - pr_info(DRV_NAME ": MIPSConfig : 0x%X\n", Adapter->bMipsConfig); + pr_info("MIPSConfig : 0x%X\n", Adapter->bMipsConfig); /* used for backward compatibility. */ Adapter->bDPLLConfig = (uiHostDrvrCfg6>>19)&0x01; Adapter->PmuMode = (uiHostDrvrCfg6 >> 24) & 0x03; - pr_info(DRV_NAME ": PMU MODE: %x", Adapter->PmuMode); + pr_info("PMU MODE: %x\n", Adapter->PmuMode); if ((uiHostDrvrCfg6 >> HOST_BUS_SUSPEND_BIT) & (0x01)) { Adapter->bDoSuspend = TRUE; - pr_info(DRV_NAME ": Making DoSuspend TRUE as per configFile"); + pr_info("Making DoSuspend TRUE as per configFile\n"); } uiEEPROMFlag = ntohl(Adapter->pstargetparams->m_u32EEPROMFlag); - pr_info(DRV_NAME ": uiEEPROMFlag : 0x%X\n", uiEEPROMFlag); + pr_info("uiEEPROMFlag : 0x%X\n", uiEEPROMFlag); Adapter->eNVMType = (NVM_TYPE)((uiEEPROMFlag>>4)&0x3); Adapter->bStatusWrite = (uiEEPROMFlag>>6)&0x1; Adapter->uiSectorSizeInCFG = 1024*(0xFFFF & ntohl(Adapter->pstargetparams->HostDrvrConfig4)); @@ -1826,7 +1824,7 @@ static void beceem_protocol_reset(PMINI_ADAPTER Adapter) { int i; if (netif_msg_link(Adapter)) - pr_notice(PFX "%s: protocol reset\n", Adapter->dev->name); + pr_notice("%s: protocol reset\n", Adapter->dev->name); netif_carrier_off(Adapter->dev); netif_stop_queue(Adapter->dev); diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c index 7240d60..a25c276 100644 --- a/drivers/staging/bcm/PHSModule.c +++ b/drivers/staging/bcm/PHSModule.c @@ -1,5 +1,3 @@ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "headers.h" static UINT CreateSFToClassifierRuleMapping(B_UINT16 uiVcid,B_UINT16 uiClsId,S_SERVICEFLOW_TABLE *psServiceFlowTable,S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI); diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index fef5945..6766f4d 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -383,7 +383,7 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex) if(PacketToDrop) { if (netif_msg_tx_err(Adapter)) - pr_info(PFX "%s: tx queue %d overlimit\n", + pr_info("%s: tx queue %d overlimit\n", Adapter->dev->name, iIndex); netstats->tx_dropped++; diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c index 589d0ea..357e54f 100644 --- a/drivers/staging/bcm/Transmit.c +++ b/drivers/staging/bcm/Transmit.c @@ -159,8 +159,8 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, struct sk_buff *Packet, USHORT Vcid) { ++Adapter->dev->stats.tx_errors; if (netif_msg_tx_err(Adapter)) - pr_info(PFX "%s: transmit error %d\n", Adapter->dev->name, - status); + pr_info("%s: transmit error %d\n", + Adapter->dev->name, status); } else { @@ -220,7 +220,7 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/ Adapter->downloadDDR +=1; status = download_ddr_settings(Adapter); if(status) - pr_err(PFX "DDR DOWNLOAD FAILED! %d\n", status); + pr_err("DDR DOWNLOAD FAILED! %d\n", status); continue; } diff --git a/drivers/staging/bcm/headers.h b/drivers/staging/bcm/headers.h index da47db8..e8d3952 100644 --- a/drivers/staging/bcm/headers.h +++ b/drivers/staging/bcm/headers.h @@ -5,6 +5,8 @@ #ifndef __HEADERS_H__ #define __HEADERS_H__ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/kernel.h> #include <linux/module.h> #include <linux/types.h> diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c index 6579357..7e708e3 100644 --- a/drivers/staging/bcm/nvm.c +++ b/drivers/staging/bcm/nvm.c @@ -1,5 +1,3 @@ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include "headers.h" #define DWORD unsigned int @@ -2598,7 +2596,7 @@ INT BcmDeAllocFlashCSStructure(PMINI_ADAPTER psAdapter) { if(psAdapter == NULL) { - pr_info(" Adapter structure point is NULL\n"); + pr_info("Adapter structure point is NULL\n"); return -EINVAL; } kfree(psAdapter->psFlashCSInfo); @@ -4523,7 +4521,7 @@ INT BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionV uiOffset = FIELD_OFFSET_IN_HEADER(PISO_HEADER,ISOImageMagicNumber); if((ReadISOSignature(Adapter,eFlashSectionVal) & 0xFF000000) != CORRUPTED_PATTERN) { - pr_info("Currupted Pattern is not there. Hence won't write sig\n"); + pr_info("Corrupted Pattern is not there. Hence won't write sig\n"); return STATUS_FAILURE; } } @@ -4732,7 +4730,7 @@ INT BcmCopySection(PMINI_ADAPTER Adapter, if((offset + numOfBytes) > BcmGetSectionValEndOffset(Adapter,SrcSection) - BcmGetSectionValStartOffset(Adapter,SrcSection)) { - pr_info(" Input parameters going beyond the section offS: %x numB: %x of Source Section\n", + pr_info("Input parameters going beyond the section offS: %x numB: %x of Source Section\n", offset, numOfBytes); return -EINVAL; } @@ -4740,7 +4738,7 @@ INT BcmCopySection(PMINI_ADAPTER Adapter, if((offset + numOfBytes) > BcmGetSectionValEndOffset(Adapter,DstSection) - BcmGetSectionValStartOffset(Adapter,DstSection)) { - pr_info(" Input parameters going beyond the section offS: %x numB: %x of Destination Section\n", + pr_info("Input parameters going beyond the section offS: %x numB: %x of Destination Section\n", offset, numOfBytes); return -EINVAL; } -- 1.7.8.111.gad25c.dirty _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
