Spaces before statement terminations are just unnecessary whitespace and are not kernel style standard, so remove them. Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> --- drivers/staging/bcm/Adapter.h | 20 +- drivers/staging/bcm/Bcmchar.c | 6 +- drivers/staging/bcm/CmHost.c | 6 +- drivers/staging/bcm/DDRInit.c | 30 ++-- drivers/staging/bcm/IPv6Protocol.c | 2 +- drivers/staging/bcm/InterfaceAdapter.h | 2 +- drivers/staging/bcm/InterfaceIdleMode.c | 10 +- drivers/staging/bcm/InterfaceInit.c | 12 +- drivers/staging/bcm/InterfaceIsr.c | 20 +- drivers/staging/bcm/InterfaceRx.c | 14 +- drivers/staging/bcm/InterfaceTx.c | 20 +- drivers/staging/bcm/Ioctl.h | 2 +- drivers/staging/bcm/LeakyBucket.c | 8 +- drivers/staging/bcm/Misc.c | 8 +- drivers/staging/bcm/PHSModule.c | 8 +- drivers/staging/bcm/PHSModule.h | 2 +- drivers/staging/bcm/led_control.c | 2 +- drivers/staging/bcm/nvm.c | 326 +++++++++++++++--------------- drivers/staging/bcm/nvm.h | 4 +- 19 files changed, 251 insertions(+), 251 deletions(-) diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h index c80c496..72817c7 100644 --- a/drivers/staging/bcm/Adapter.h +++ b/drivers/staging/bcm/Adapter.h @@ -411,7 +411,7 @@ struct _MINI_ADAPTER { BOOLEAN fw_download_done; char *txctlpacket[MAX_CNTRL_PKTS]; - atomic_t cntrlpktCnt ; + atomic_t cntrlpktCnt; atomic_t index_app_read_cntrlpkt; atomic_t index_wr_txcntrlpkt; atomic_t index_rd_txcntrlpkt; @@ -517,27 +517,27 @@ struct _MINI_ADAPTER { // BOOLEAN InterfaceUpStatus; PFLASH2X_CS_INFO psFlash2xCSInfo; - PFLASH_CS_INFO psFlashCSInfo ; + PFLASH_CS_INFO psFlashCSInfo; PFLASH2X_VENDORSPECIFIC_INFO psFlash2xVendorInfo; unsigned int uiFlashBaseAdd; //Flash start address unsigned int uiActiveISOOffset; //Active ISO offset chosen before f/w download FLASH2X_SECTION_VAL eActiveISO; //Active ISO section val FLASH2X_SECTION_VAL eActiveDSD; //Active DSD val chosen before f/w download unsigned int uiActiveDSDOffsetAtFwDld; //For accessing Active DSD chosen before f/w download - unsigned int uiFlashLayoutMajorVersion ; + unsigned int uiFlashLayoutMajorVersion; unsigned int uiFlashLayoutMinorVersion; - BOOLEAN bAllDSDWriteAllow ; - BOOLEAN bSigCorrupted ; + BOOLEAN bAllDSDWriteAllow; + BOOLEAN bSigCorrupted; //this should be set who so ever want to change the Headers. after Wrtie it should be reset immediately. - BOOLEAN bHeaderChangeAllowed ; + BOOLEAN bHeaderChangeAllowed; int SelectedChip; BOOLEAN bEndPointHalted; //while bFlashRawRead will be true, Driver ignore map lay out and consider flash as of without any map. BOOLEAN bFlashRawRead; - BOOLEAN bPreparingForLowPowerMode ; - BOOLEAN bDoSuspend ; - unsigned int syscfgBefFwDld ; - BOOLEAN StopAllXaction ; + BOOLEAN bPreparingForLowPowerMode; + BOOLEAN bDoSuspend; + unsigned int syscfgBefFwDld; + BOOLEAN StopAllXaction; unsigned int liTimeSinceLastNetEntry; //Used to Support extended CAPI requirements from struct semaphore LowPowerModeSync; unsigned long liDrainCalculated; diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 61b0e52..71bb0f8 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -1484,7 +1484,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned int cmd, unsigned long ar else BuffSize = NOB; - ReadOffset = sFlash2xRead.offset ; + ReadOffset = sFlash2xRead.offset; OutPutBuff = IoBuffer.OutputBuffer; pReadBuff = kzalloc(BuffSize, GFP_KERNEL); @@ -1534,7 +1534,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned int cmd, unsigned long ar NOB = NOB - ReadBytes; if (NOB) { ReadOffset = ReadOffset + ReadBytes; - OutPutBuff = OutPutBuff + ReadBytes ; + OutPutBuff = OutPutBuff + ReadBytes; } } @@ -1596,7 +1596,7 @@ static long bcm_char_ioctl(struct file *filp, unsigned int cmd, unsigned long ar if (NOB > Adapter->uiSectorSize) BuffSize = Adapter->uiSectorSize; else - BuffSize = NOB ; + BuffSize = NOB; pWriteBuff = kmalloc(BuffSize, GFP_KERNEL); diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index 4b75db0..0a5d940 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c @@ -1870,7 +1870,7 @@ unsigned long StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffe AddRequest.u16TID = pstAddIndicationAlt->u16TID; AddRequest.u16CID = pstAddIndicationAlt->u16CID; AddRequest.u16VCID = pstAddIndicationAlt->u16VCID; - AddRequest.psfParameterSet =pstAddIndication->psfAuthorizedSet ; + AddRequest.psfParameterSet =pstAddIndication->psfAuthorizedSet; (*puBufferLength) = sizeof(stLocalSFAddRequest); memcpy(pvBuffer,&AddRequest, sizeof(stLocalSFAddRequest)); return 1; @@ -1881,7 +1881,7 @@ unsigned long StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, void *pvBuffe //We need to extract the structure from the buffer and pack it differently pstAddIndication->u8Type = pstAddIndicationAlt->u8Type; - pstAddIndication->eConnectionDir= pstAddIndicationAlt->u8Direction ; + pstAddIndication->eConnectionDir= pstAddIndicationAlt->u8Direction; pstAddIndication->u16TID = pstAddIndicationAlt->u16TID; pstAddIndication->u16CID = pstAddIndicationAlt->u16CID; pstAddIndication->u16VCID = pstAddIndicationAlt->u16VCID; @@ -2414,7 +2414,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /**<Pointer to the Adap break; default: kfree(pstAddIndication); - return FALSE ; + return FALSE; } return TRUE; } diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c index e20c5a3..9bf8e20 100644 --- a/drivers/staging/bcm/DDRInit.c +++ b/drivers/staging/bcm/DDRInit.c @@ -1121,20 +1121,20 @@ int download_ddr_settings(PMINI_ADAPTER Adapter) case DDR_80_MHZ: psDDRSetting = asT3LP_DDRSetting80MHz; RegCount = (sizeof(asT3LP_DDRSetting80MHz)/sizeof(DDR_SET_NODE)); - RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ; + RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_80MHZ; psDDRSetting += T3LP_SKIP_CLOCK_PROGRAM_DUMP_80MHZ; break; case DDR_100_MHZ: psDDRSetting = asT3LP_DDRSetting100MHz; RegCount = (sizeof(asT3LP_DDRSetting100MHz)/sizeof(DDR_SET_NODE)); - RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ; + RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_100MHZ; psDDRSetting += T3LP_SKIP_CLOCK_PROGRAM_DUMP_100MHZ; break; case DDR_133_MHZ: bOverrideSelfRefresh = TRUE; psDDRSetting = asT3LP_DDRSetting133MHz; RegCount = (sizeof(asT3LP_DDRSetting133MHz)/sizeof(DDR_SET_NODE)); - RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ; + RegCount -= T3LP_SKIP_CLOCK_PROGRAM_DUMP_133MHZ; psDDRSetting += T3LP_SKIP_CLOCK_PROGRAM_DUMP_133MHZ; break; default: @@ -1151,20 +1151,20 @@ int download_ddr_settings(PMINI_ADAPTER Adapter) case DDR_80_MHZ: psDDRSetting = asT3LPB_DDRSetting80MHz; RegCount=(sizeof(asT3LPB_DDRSetting80MHz)/sizeof(DDR_SET_NODE)); - RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ; + RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_80MHZ; psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_80MHZ; break; case DDR_100_MHZ: psDDRSetting = asT3LPB_DDRSetting100MHz; RegCount = (sizeof(asT3LPB_DDRSetting100MHz)/sizeof(DDR_SET_NODE)); - RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ; + RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_100MHZ; psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_100MHZ; break; case DDR_133_MHZ: bOverrideSelfRefresh = TRUE; psDDRSetting = asT3LPB_DDRSetting133MHz; RegCount = (sizeof(asT3LPB_DDRSetting133MHz)/sizeof(DDR_SET_NODE)); - RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ; + RegCount -= T3LPB_SKIP_CLOCK_PROGRAM_DUMP_133MHZ; psDDRSetting += T3LPB_SKIP_CLOCK_PROGRAM_DUMP_133MHZ; break; @@ -1185,20 +1185,20 @@ int download_ddr_settings(PMINI_ADAPTER Adapter) case DDR_80_MHZ: psDDRSetting = asT3_DDRSetting80MHz; RegCount = (sizeof(asT3_DDRSetting80MHz)/sizeof(DDR_SET_NODE)); - RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ; + RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_80MHZ; psDDRSetting += T3_SKIP_CLOCK_PROGRAM_DUMP_80MHZ; break; case DDR_100_MHZ: psDDRSetting = asT3_DDRSetting100MHz; RegCount = (sizeof(asT3_DDRSetting100MHz)/sizeof(DDR_SET_NODE)); - RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ; + RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_100MHZ; psDDRSetting += T3_SKIP_CLOCK_PROGRAM_DUMP_100MHZ; break; case DDR_133_MHZ: psDDRSetting = asT3_DDRSetting133MHz; RegCount = (sizeof(asT3_DDRSetting133MHz)/sizeof(DDR_SET_NODE)); - RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ; - psDDRSetting += T3_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ; + RegCount-=T3_SKIP_CLOCK_PROGRAM_DUMP_133MHZ; + psDDRSetting += T3_SKIP_CLOCK_PROGRAM_DUMP_133MHZ; break; default: return -EINVAL; @@ -1209,20 +1209,20 @@ int download_ddr_settings(PMINI_ADAPTER Adapter) case DDR_80_MHZ: psDDRSetting = asT3B_DDRSetting80MHz; RegCount = (sizeof(asT3B_DDRSetting80MHz)/sizeof(DDR_SET_NODE)); - RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_80MHZ ; + RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_80MHZ; psDDRSetting += T3B_SKIP_CLOCK_PROGRAM_DUMP_80MHZ; break; case DDR_100_MHZ: psDDRSetting = asT3B_DDRSetting100MHz; RegCount = (sizeof(asT3B_DDRSetting100MHz)/sizeof(DDR_SET_NODE)); - RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_100MHZ ; + RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_100MHZ; psDDRSetting += T3B_SKIP_CLOCK_PROGRAM_DUMP_100MHZ; break; case DDR_133_MHZ: bOverrideSelfRefresh = TRUE; psDDRSetting = asT3B_DDRSetting133MHz; RegCount = (sizeof(asT3B_DDRSetting133MHz)/sizeof(DDR_SET_NODE)); - RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ ; + RegCount -= T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ; psDDRSetting += T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ; break; } @@ -1232,7 +1232,7 @@ int download_ddr_settings(PMINI_ADAPTER Adapter) return -EINVAL; } //total number of Register that has to be dumped - value =RegCount ; + value =RegCount; retval = wrmalt(Adapter, ul_ddr_setting_load_addr, &value, sizeof(value)); if (retval) { pr_info("%s:%d\n", __func__, __LINE__); @@ -1252,7 +1252,7 @@ int download_ddr_settings(PMINI_ADAPTER Adapter) RegCount *= (sizeof(DDR_SETTING)/sizeof(unsigned long)); while (RegCount && !retval) { - value = psDDRSetting->ulRegAddress ; + value = psDDRSetting->ulRegAddress; retval = wrmalt( Adapter, ul_ddr_setting_load_addr, &value, sizeof(value)); ul_ddr_setting_load_addr += sizeof(unsigned long); if (!retval) { diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c index 3a93be3..2484796 100644 --- a/drivers/staging/bcm/IPv6Protocol.c +++ b/drivers/staging/bcm/IPv6Protocol.c @@ -62,7 +62,7 @@ static unsigned char * GetNextIPV6ChainedHeader(unsigned char **ppucPayload, uns bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "IPv6 DestOpts Header Header\n"); usNextHeaderOffset+= sizeof(IPV6DestOptionsHeader); - usNextHeaderOffset+= nTotalOptions * IPV6_DESTOPTS_HDR_OPTIONSIZE ; + usNextHeaderOffset+= nTotalOptions * IPV6_DESTOPTS_HDR_OPTIONSIZE; } break; diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h index abfe87c..8b02c65 100644 --- a/drivers/staging/bcm/InterfaceAdapter.h +++ b/drivers/staging/bcm/InterfaceAdapter.h @@ -80,7 +80,7 @@ typedef struct _S_INTERFACE_ADAPTER { PMINI_ADAPTER psAdapter; BOOLEAN bFlashBoot; - BOOLEAN bHighSpeedDevice ; + BOOLEAN bHighSpeedDevice; BOOLEAN bSuspended; BOOLEAN bPreparingForBusSuspend; diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c index 2d82d08..22b2ad7 100644 --- a/drivers/staging/bcm/InterfaceIdleMode.c +++ b/drivers/staging/bcm/InterfaceIdleMode.c @@ -65,7 +65,7 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer) } if (Adapter->ulPowerSaveMode == DEVICE_POWERSAVE_MODE_AS_MANUAL_CLOCK_GATING) { - uiRegRead = 0x00000000 ; + uiRegRead = 0x00000000; status = wrmalt (Adapter, DEBUG_INTERRUPT_GENERATOR_REGISTOR, &uiRegRead, sizeof(uiRegRead)); if (status) { pr_info("wrm failed while clearing Idle Mode Reg\n"); @@ -102,7 +102,7 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer) if (TRUE == Adapter->IdleMode) { bcm_dbg(Adapter, OTHERS, IDLE_MODE, ALL, "Device is already in Idle mode....\n"); - return status ; + return status; } uiRegRead = 0; @@ -146,7 +146,7 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern) { int status = STATUS_SUCCESS; unsigned int value; - unsigned int chip_id ; + unsigned int chip_id; unsigned long timeout = 0 , itr = 0; int lenwritten = 0; @@ -210,9 +210,9 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern) //mdelay(25); - timeout= jiffies + msecs_to_jiffies(50) ; + timeout= jiffies + msecs_to_jiffies(50); while ( timeout > jiffies ) { - itr++ ; + itr++; rdmalt(Adapter, CHIP_ID_REG, &chip_id, sizeof(unsigned int)); if (0xbece3200==(chip_id&~(0xF0))) { chip_id = chip_id&~(0xF0); diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c index 4411144..03a888e 100644 --- a/drivers/staging/bcm/InterfaceInit.c +++ b/drivers/staging/bcm/InterfaceInit.c @@ -269,7 +269,7 @@ static void usbbcm_disconnect(struct usb_interface *intf) if (psAdapter->bDoSuspend) intf->needs_remote_wakeup = 0; - psAdapter->device_removed = TRUE ; + psAdapter->device_removed = TRUE; usb_set_intfdata(intf, NULL); InterfaceAdapterFree(psIntfAdapter); usb_put_dev(udev); @@ -424,7 +424,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter) size_t buffer_size; unsigned long value; int retval = 0; - int usedIntOutForBulkTransfer = 0 ; + int usedIntOutForBulkTransfer = 0; BOOLEAN bBcm16 = FALSE; unsigned int uiData = 0; int bytes; @@ -468,7 +468,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter) bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL, "BCM16 is applicable on this dongle\n"); if (retval || (psIntfAdapter->bHighSpeedDevice == FALSE)) { - usedIntOutForBulkTransfer = EP2 ; + usedIntOutForBulkTransfer = EP2; endpoint = &iface_desc->endpoint[EP2].desc; bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL, "Interface altsetting failed or modem is configured to Full Speed, hence will work on default setting 0\n"); @@ -492,7 +492,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter) if (retval) { bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL, "reset failed. Re-enumerating the device.\n"); - return retval ; + return retval; } } @@ -504,7 +504,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter) BeceemEEPROMBulkWrite(psIntfAdapter->psAdapter, (unsigned char *)&_uiData, 0x136, 4, TRUE); } } else { - usedIntOutForBulkTransfer = EP4 ; + usedIntOutForBulkTransfer = EP4; endpoint = &iface_desc->endpoint[EP4].desc; bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL, "Choosing AltSetting as a default setting.\n"); @@ -622,7 +622,7 @@ static int InterfaceSuspend(struct usb_interface *intf, pm_message_t message) psIntfAdapter->bPreparingForBusSuspend = FALSE; if (psIntfAdapter->psAdapter->LinkStatus == LINKUP_DONE) { - psIntfAdapter->psAdapter->IdleMode = TRUE ; + psIntfAdapter->psAdapter->IdleMode = TRUE; bcm_dbg(psIntfAdapter->psAdapter, INITEXIT, DRV_ENTRY, ALL, "Host Entered in PMU Idle Mode.\n"); } else { diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c index f798d5c..12197b3 100644 --- a/drivers/staging/bcm/InterfaceIsr.c +++ b/drivers/staging/bcm/InterfaceIsr.c @@ -5,7 +5,7 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) { int status = urb->status; PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)urb->context; - PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter ; + PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter; if (netif_msg_intr(Adapter)) pr_info("%s: interrupt status %d\n", @@ -14,7 +14,7 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) if (Adapter->device_removed == TRUE) { bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL, "Device has Got Removed.\n"); - return ; + return; } if (((Adapter->bPreparingForLowPowerMode == TRUE) && (Adapter->bDoSuspend == TRUE)) || @@ -22,7 +22,7 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) psIntfAdapter->bPreparingForBusSuspend) { bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL, "Interrupt call back is called while suspending the device\n"); - return ; + return; } //bcm_dbg(Adapter, TX, NEXT_SEND, ALL, @@ -75,23 +75,23 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) { bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL, "URB has got disconnected ....\n"); - return ; + return; } case -EINPROGRESS: { //This situation may happened when URBunlink is used. for detail check usb_unlink_urb documentation. bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL, "Impossibe condition has occurred... something very bad is going on\n"); - break ; + break; //return; } case -EPIPE: { bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL, "Interrupt IN endPoint has got halted/stalled...need to clear this\n"); - Adapter->bEndPointHalted = TRUE ; + Adapter->bEndPointHalted = TRUE; wake_up(&Adapter->tx_packet_wait_queue); - urb->status = STATUS_SUCCESS ; + urb->status = STATUS_SUCCESS; return; } /* software-driven interface shutdown */ @@ -102,8 +102,8 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) case -EINVAL : //Some thing very bad happened with the URB. No description is available. bcm_dbg(Adapter, OTHERS, INTF_INIT, ALL, "interrupt urb error %d\n", status); - urb->status = STATUS_SUCCESS ; - break ; + urb->status = STATUS_SUCCESS; + break; //return; default: //This is required to check what is the defaults conditions when it occurs.. @@ -163,7 +163,7 @@ int StartInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter) OTHERS, INTF_INIT, ALL, "Cannot send int urb %d\n", status); if (status == -EPIPE) { - psIntfAdapter->psAdapter->bEndPointHalted = TRUE ; + psIntfAdapter->psAdapter->bEndPointHalted = TRUE; wake_up(&psIntfAdapter->psAdapter->tx_packet_wait_queue); } } diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c index 3bc25a2..89e7580 100644 --- a/drivers/staging/bcm/InterfaceRx.c +++ b/drivers/staging/bcm/InterfaceRx.c @@ -42,7 +42,7 @@ static void read_bulk_callback(struct urb *urb) int QueueIndex = NO_OF_QUEUES + 1; unsigned int uiIndex=0; int process_done = 1; - //int idleflag = 0 ; + //int idleflag = 0; PUSB_RCB pRcb = (PUSB_RCB)urb->context; PS_INTERFACE_ADAPTER psIntfAdapter = pRcb->psIntfAdapter; PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter; @@ -63,7 +63,7 @@ static void read_bulk_callback(struct urb *urb) if (urb->status != STATUS_SUCCESS) { if (urb->status == -EPIPE) { - Adapter->bEndPointHalted = TRUE ; + Adapter->bEndPointHalted = TRUE; wake_up(&Adapter->tx_packet_wait_queue); } else { bcm_dbg(Adapter, RX, RX_DPC, ALL, @@ -72,14 +72,14 @@ static void read_bulk_callback(struct urb *urb) } pRcb->bUsed = FALSE; atomic_dec(&psIntfAdapter->uNumRcbUsed); - urb->status = STATUS_SUCCESS ; - return ; + urb->status = STATUS_SUCCESS; + return; } if (Adapter->bDoSuspend && (Adapter->bPreparingForLowPowerMode)) { bcm_dbg(Adapter, RX, RX_DPC, ALL, "device is going in low power mode while PMU option selected..hence rx packet should not be process\n"); - return ; + return; } bcm_dbg(Adapter, RX, RX_DPC, ALL, @@ -177,7 +177,7 @@ static void read_bulk_callback(struct urb *urb) ++Adapter->dev->stats.rx_packets; Adapter->dev->stats.rx_bytes += pLeader->PLength; - for (uiIndex = 0 ; uiIndex < MIBS_MAX_HIST_ENTRIES ; uiIndex++) { + for (uiIndex = 0; uiIndex < MIBS_MAX_HIST_ENTRIES; uiIndex++) { if ((pLeader->PLength <= MIBS_PKTSIZEHIST_RANGE*(uiIndex+1)) && (pLeader->PLength > MIBS_PKTSIZEHIST_RANGE*(uiIndex))) Adapter->aRxPktSizeHist[uiIndex]++; @@ -208,7 +208,7 @@ static int ReceiveRcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_RCB pRcb) retval); //if this return value is because of pipe halt. need to clear this. if (retval == -EPIPE) { - psIntfAdapter->psAdapter->bEndPointHalted = TRUE ; + psIntfAdapter->psAdapter->bEndPointHalted = TRUE; wake_up(&psIntfAdapter->psAdapter->tx_packet_wait_queue); } diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c index 715f365..44dd235 100644 --- a/drivers/staging/bcm/InterfaceTx.c +++ b/drivers/staging/bcm/InterfaceTx.c @@ -6,8 +6,8 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/) PUSB_TCB pTcb= (PUSB_TCB)urb->context; PS_INTERFACE_ADAPTER psIntfAdapter = pTcb->psIntfAdapter; CONTROL_MESSAGE *pControlMsg = (CONTROL_MESSAGE *)urb->transfer_buffer; - PMINI_ADAPTER psAdapter = psIntfAdapter->psAdapter ; - BOOLEAN bpowerDownMsg = FALSE ; + PMINI_ADAPTER psAdapter = psIntfAdapter->psAdapter; + BOOLEAN bpowerDownMsg = FALSE; PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); if (unlikely(netif_msg_tx_done(Adapter))) @@ -15,7 +15,7 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/) if (urb->status != STATUS_SUCCESS) { if (urb->status == -EPIPE) { - psIntfAdapter->psAdapter->bEndPointHalted = TRUE ; + psIntfAdapter->psAdapter->bEndPointHalted = TRUE; wake_up(&psIntfAdapter->psAdapter->tx_packet_wait_queue); } else { bcm_dbg(Adapter, TX, NEXT_SEND, ALL, @@ -35,10 +35,10 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/) (pControlMsg->szData[1] == TARGET_CAN_GO_TO_IDLE_MODE))) { - bpowerDownMsg = TRUE ; + bpowerDownMsg = TRUE; //This covers the bus err while Idle Request msg sent down. if (urb->status != STATUS_SUCCESS) { - psAdapter->bPreparingForLowPowerMode = FALSE ; + psAdapter->bPreparingForLowPowerMode = FALSE; bcm_dbg(Adapter, TX, NEXT_SEND, ALL, "Idle Mode Request msg failed to reach to Modem\n"); //Signalling the cntrl pkt path in Ioctl @@ -50,7 +50,7 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/) if (psAdapter->bDoSuspend == FALSE) { psAdapter->IdleMode = TRUE; //since going in Idle mode completed hence making this var false; - psAdapter->bPreparingForLowPowerMode = FALSE ; + psAdapter->bPreparingForLowPowerMode = FALSE; bcm_dbg(Adapter, TX, NEXT_SEND, ALL, "Host Entered in Idle Mode State...\n"); @@ -64,7 +64,7 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/) (pControlMsg->szData[2] == SHUTDOWN_ACK_FROM_DRIVER)) { //This covers the bus err while shutdown Request msg sent down. if (urb->status != STATUS_SUCCESS) { - psAdapter->bPreparingForLowPowerMode = FALSE ; + psAdapter->bPreparingForLowPowerMode = FALSE; bcm_dbg(Adapter, TX, NEXT_SEND, ALL, "Shutdown Request Msg failed to reach to Modem\n"); //Signalling the cntrl pkt path in Ioctl @@ -73,11 +73,11 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/) goto err_exit; } - bpowerDownMsg = TRUE ; + bpowerDownMsg = TRUE; if (psAdapter->bDoSuspend == FALSE) { psAdapter->bShutStatus = TRUE; //since going in shutdown mode completed hence making this var false; - psAdapter->bPreparingForLowPowerMode = FALSE ; + psAdapter->bPreparingForLowPowerMode = FALSE; bcm_dbg(Adapter, TX, NEXT_SEND, ALL, "Host Entered in shutdown Mode State...\n"); //Signalling the cntrl pkt path in Ioctl @@ -163,7 +163,7 @@ static int TransmitTcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_TCB pTcb, void * "failed submitting write urb, error %d\n", retval); if (retval == -EPIPE) { - psIntfAdapter->psAdapter->bEndPointHalted = TRUE ; + psIntfAdapter->psAdapter->bEndPointHalted = TRUE; wake_up(&psIntfAdapter->psAdapter->tx_packet_wait_queue); } } diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h index 6ea3f77..0f821c7 100644 --- a/drivers/staging/bcm/Ioctl.h +++ b/drivers/staging/bcm/Ioctl.h @@ -23,7 +23,7 @@ typedef struct ioctlbuffer { typedef struct stGPIOInfo { unsigned int uiGpioNumber; /* valid numbers 0-15 */ - unsigned int uiGpioValue; /* 1 set ; 0 not set */ + unsigned int uiGpioValue; /* 1 set; 0 not set */ }__attribute__((packed))GPIO_INFO,*PGPIO_INFO; typedef struct stUserThreadReq { diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c index 27e49cc..22d97eb 100644 --- a/drivers/staging/bcm/LeakyBucket.c +++ b/drivers/staging/bcm/LeakyBucket.c @@ -173,7 +173,7 @@ static void CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF) bcm_dbg(Adapter, TX, TX_PACKETS, ALL, "No Free Tx Descriptor(%d) is available for Data pkt..\n", atomic_read(&Adapter->CurrNumFreeTxDesc)); - return ; + return; } spin_lock_bh(&psSF->SFQueueLock); @@ -267,7 +267,7 @@ void transmit_packets(PMINI_ADAPTER Adapter) unsigned int uiPrevTotalCount = 0; int iIndex = 0; - BOOLEAN exit_flag = TRUE ; + BOOLEAN exit_flag = TRUE; bcm_dbg(Adapter, TX, TX_PACKETS, ALL, "=====>\n"); @@ -305,7 +305,7 @@ void transmit_packets(PMINI_ADAPTER Adapter) } while (uiPrevTotalCount > 0 && !Adapter->device_removed) { - exit_flag = TRUE ; + exit_flag = TRUE; //second iteration to parse non-pending queues for (iIndex = HiPriority; iIndex >= 0; iIndex--) { if ( !uiPrevTotalCount || (TRUE == Adapter->device_removed)) @@ -328,7 +328,7 @@ void transmit_packets(PMINI_ADAPTER Adapter) break; } if (exit_flag == TRUE ) - break ; + break; }/* end of inner while loop */ update_per_cid_rx (Adapter); diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c index ffbace9..b228130 100644 --- a/drivers/staging/bcm/Misc.c +++ b/drivers/staging/bcm/Misc.c @@ -638,9 +638,9 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter) /********************************* *down_trylock - * if [ semaphore is available ] - * acquire semaphone and return value 0 ; + * acquire semaphone and return value 0; * else - * return non-zero value ; + * return non-zero value; * ***********************************/ @@ -1588,9 +1588,9 @@ static void SendShutModeResponse(PMINI_ADAPTER Adapter) /********************************* * down_trylock - * if [ semaphore is available ] - * acquire semaphone and return value 0 ; + * acquire semaphone and return value 0; * else - * return non-zero value ; + * return non-zero value; * ***********************************/ diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c index f432318..bd4a66c 100644 --- a/drivers/staging/bcm/PHSModule.c +++ b/drivers/staging/bcm/PHSModule.c @@ -665,7 +665,7 @@ unsigned long PhsCompress(IN void* pvContext, if (pDeviceExtension == NULL) { bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL, "Invalid Device Extension\n"); - lStatus = STATUS_PHS_NOCOMPRESSION ; + lStatus = STATUS_PHS_NOCOMPRESSION; return lStatus; } @@ -678,7 +678,7 @@ unsigned long PhsCompress(IN void* pvContext, uiVcid,&pstServiceFlowEntry); if (nSFIndex == PHS_INVALID_TABLE_INDEX) { bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL, "SFID Match Failed\n"); - lStatus = STATUS_PHS_NOCOMPRESSION ; + lStatus = STATUS_PHS_NOCOMPRESSION; return lStatus; } @@ -688,7 +688,7 @@ unsigned long PhsCompress(IN void* pvContext, if (nClsidIndex == PHS_INVALID_TABLE_INDEX) { bcm_dbg(Adapter, OTHERS, PHS_SEND, ALL, "No PHS Rule Defined For Classifier\n"); - lStatus = STATUS_PHS_NOCOMPRESSION ; + lStatus = STATUS_PHS_NOCOMPRESSION; return lStatus; } @@ -699,7 +699,7 @@ unsigned long PhsCompress(IN void* pvContext, if (!ValidatePHSRuleComplete(pstPhsRule)) { bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL, "PHS Rule Defined For Classifier But Not Complete\n"); - lStatus = STATUS_PHS_NOCOMPRESSION ; + lStatus = STATUS_PHS_NOCOMPRESSION; return lStatus; } diff --git a/drivers/staging/bcm/PHSModule.h b/drivers/staging/bcm/PHSModule.h index 5fe0e9f..9a0718f 100644 --- a/drivers/staging/bcm/PHSModule.h +++ b/drivers/staging/bcm/PHSModule.h @@ -36,7 +36,7 @@ unsigned long PhsDeletePHSRule(void* pvContext, unsigned short uiVcid, unsigned unsigned long PhsDeleteClassifierRule(void* pvContext, unsigned short uiVcid , unsigned short uiClsId); -unsigned long PhsDeleteSFRules(void* pvContext, unsigned short uiVcid) ; +unsigned long PhsDeleteSFRules(void* pvContext, unsigned short uiVcid); BOOLEAN ValidatePHSRule(S_PHS_RULE *psPhsRule); diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c index ed0b6f9..31541e9 100644 --- a/drivers/staging/bcm/led_control.c +++ b/drivers/staging/bcm/led_control.c @@ -876,7 +876,7 @@ int InitLedSettings(PMINI_ADAPTER Adapter) if (Adapter->LEDInfo.led_thread_running) { if (bEnableThread) { - ; +; } else { Adapter->DriverState = DRIVER_HALT; wake_up(&Adapter->LEDInfo.notify_led_event); diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c index 126fe0d..1b898e2 100644 --- a/drivers/staging/bcm/nvm.c +++ b/drivers/staging/bcm/nvm.c @@ -69,12 +69,12 @@ static unsigned char ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter ) unsigned int value1 = 0; /* Read the EEPROM status register */ - value = EEPROM_READ_STATUS_REGISTER ; + value = EEPROM_READ_STATUS_REGISTER; wrmalt( Adapter, EEPROM_CMDQ_SPI_REG, &value, sizeof(value)); while ( dwRetries != 0 ) { value=0; - uiStatus = 0 ; + uiStatus = 0; rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &uiStatus, sizeof(uiStatus)); if (Adapter->device_removed == TRUE) { pr_info("Modem has got removed hence exiting....\n"); @@ -94,7 +94,7 @@ static unsigned char ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter ) break; } - dwRetries-- ; + dwRetries--; if ( dwRetries == 0 ) { rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value)); rdmalt(Adapter, EEPROM_SPI_Q_STATUS_REG, &value1, sizeof(value1)); @@ -105,7 +105,7 @@ static unsigned char ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter ) } if ( !(dwRetries%RETRIES_PER_DELAY) ) msleep(1); - uiStatus = 0 ; + uiStatus = 0; } return uiData; } /* ReadEEPROMStatusRegister */ @@ -165,7 +165,7 @@ int ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter, if ( dwNumWords == 4 ) { if ( ( uiStatus & EEPROM_READ_DATA_FULL ) != 0 ) { /* Clear the Avail/Full bits - which ever is set. */ - value = ( uiStatus & (EEPROM_READ_DATA_AVAIL | EEPROM_READ_DATA_FULL) ) ; + value = ( uiStatus & (EEPROM_READ_DATA_AVAIL | EEPROM_READ_DATA_FULL) ); wrmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG,&value, sizeof(value)); break; } @@ -688,7 +688,7 @@ static int flashByteWrite( if (uiStatus & 0x1) { pr_info("Flash Write fails even after checking status for 200 times\n"); - return STATUS_FAILURE ; + return STATUS_FAILURE; } return STATUS_SUCCESS; @@ -772,7 +772,7 @@ static int flashWrite( if (uiStatus & 0x1) { pr_info("Flash Write fails even after checking status for 200 times\n"); - return STATUS_FAILURE ; + return STATUS_FAILURE; } return STATUS_SUCCESS; @@ -852,7 +852,7 @@ static int flashByteWriteStatus( if (uiStatus & 0x1) { pr_info("Flash Write fails even after checking status for 200 times\n"); - return STATUS_FAILURE ; + return STATUS_FAILURE; } return STATUS_SUCCESS; @@ -928,7 +928,7 @@ static int flashWriteStatus( if (uiStatus & 0x1) { pr_info("Flash Write fails even after checking status for 200 times\n"); - return STATUS_FAILURE ; + return STATUS_FAILURE; } return STATUS_SUCCESS; @@ -1123,7 +1123,7 @@ static int BeceemFlashBulkWrite( if (IsFlash2x(Adapter) && (Adapter->bAllDSDWriteAllow == FALSE)) { index = 0; - uiTemp = uiNumSectTobeRead ; + uiTemp = uiNumSectTobeRead; while (uiTemp) { if (IsOffsetWritable(Adapter, uiOffsetFromSectStart + index * Adapter->uiSectorSize ) == FALSE) { pr_info("Sector Starting at offset <0X%X> is not writable\n", @@ -1133,7 +1133,7 @@ static int BeceemFlashBulkWrite( goto BeceemFlashBulkWrite_EXIT; } uiTemp = uiTemp - 1; - index = index + 1 ; + index = index + 1; } } Adapter->SelectedChip = RESET_CHIP_SELECT; @@ -1332,7 +1332,7 @@ static int BeceemFlashBulkWriteStatus( if (IsFlash2x(Adapter) && (Adapter->bAllDSDWriteAllow == FALSE)) { index = 0; - uiTemp = uiNumSectTobeRead ; + uiTemp = uiNumSectTobeRead; while (uiTemp) { if (IsOffsetWritable(Adapter, uiOffsetFromSectStart + index * Adapter->uiSectorSize ) == FALSE) { pr_info("Sector Starting at offset <0X%x> is not writable\n", @@ -1342,7 +1342,7 @@ static int BeceemFlashBulkWriteStatus( goto BeceemFlashBulkWriteStatus_EXIT; } uiTemp = uiTemp - 1; - index = index + 1 ; + index = index + 1; } } @@ -1686,18 +1686,18 @@ static int BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, unsigned int uiData[], /* Flush the Write/Read/Cmd queues. */ value = ( EEPROM_WRITE_QUEUE_FLUSH | EEPROM_CMD_QUEUE_FLUSH | EEPROM_READ_QUEUE_FLUSH ); wrmalt( Adapter, SPI_FLUSH_REG, &value, sizeof(value)); - value = 0 ; + value = 0; wrmalt( Adapter, SPI_FLUSH_REG, &value, sizeof(value) ); /* Clear the Empty/Avail/Full bits. After this it has been confirmed * that the bit was cleared by reading back the register. See NOTE below. * We also clear the Read queues as we do a EEPROM status register read * later. */ - value = ( EEPROM_WRITE_QUEUE_EMPTY | EEPROM_WRITE_QUEUE_AVAIL | EEPROM_WRITE_QUEUE_FULL | EEPROM_READ_DATA_AVAIL | EEPROM_READ_DATA_FULL ) ; + value = ( EEPROM_WRITE_QUEUE_EMPTY | EEPROM_WRITE_QUEUE_AVAIL | EEPROM_WRITE_QUEUE_FULL | EEPROM_READ_DATA_AVAIL | EEPROM_READ_DATA_FULL ); wrmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG,&value, sizeof(value)); /* Enable write */ - value = EEPROM_WRITE_ENABLE ; + value = EEPROM_WRITE_ENABLE; wrmalt( Adapter, EEPROM_CMDQ_SPI_REG,&value, sizeof(value) ); /* We can write back to back 8bits * 16 into the queue and as we have @@ -1723,7 +1723,7 @@ static int BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, unsigned int uiData[], * shows that we see 7 for the EEPROM data write. Which means that * queue got full, also space is available as well as the queue is empty. * This may happen in sequence. */ - value = EEPROM_16_BYTE_PAGE_WRITE | uiOffset ; + value = EEPROM_16_BYTE_PAGE_WRITE | uiOffset; wrmalt( Adapter, EEPROM_CMDQ_SPI_REG, &value, sizeof(value) ); /* Ideally we should loop here without tries and eventually succeed. @@ -1737,7 +1737,7 @@ static int BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, unsigned int uiData[], pr_info("0x0f003004 = %x, %d retries failed\n", uiStatus, MAX_EEPROM_RETRIES * RETRIES_PER_DELAY); - return STATUS_FAILURE ; + return STATUS_FAILURE; } if ( !(uiRetries%RETRIES_PER_DELAY) ) @@ -1766,7 +1766,7 @@ static int BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, unsigned int uiData[], uiRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY; uiEpromStatus = 0; while ( uiRetries != 0 ) { - uiEpromStatus = ReadEEPROMStatusRegister( Adapter) ; + uiEpromStatus = ReadEEPROMStatusRegister( Adapter); if (Adapter->device_removed == TRUE) { pr_info("Modem has got removed hence exiting from loop...\n"); return -ENODEV; @@ -1776,21 +1776,21 @@ static int BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, unsigned int uiData[], uiEpromStatus, MAX_EEPROM_RETRIES * RETRIES_PER_DELAY - uiRetries); - return STATUS_SUCCESS ; + return STATUS_SUCCESS; } uiRetries--; if ( uiRetries == 0 ) { pr_info("0x0f003004 = %x, for EEPROM status read %d retries failed\n", uiEpromStatus, MAX_EEPROM_RETRIES * RETRIES_PER_DELAY); - return STATUS_FAILURE ; + return STATUS_FAILURE; } uiEpromStatus = 0; if ( !(uiRetries%RETRIES_PER_DELAY) ) msleep(1); } - return STATUS_SUCCESS ; + return STATUS_SUCCESS; } /* BeceemEEPROMWritePage */ @@ -1918,7 +1918,7 @@ int BeceemNVMRead( if (Adapter->bFlashRawRead == FALSE) { if (IsSectionExistInVendorInfo(Adapter, Adapter->eActiveDSD)) return vendorextnReadSection(Adapter, (unsigned char *)pBuffer, Adapter->eActiveDSD, uiOffset, uiNumBytes); - uiOffset = uiOffset+ Adapter->ulFlashCalStart ; + uiOffset = uiOffset+ Adapter->ulFlashCalStart; } #if defined(BCM_SHM_INTERFACE) && !defined(FLASH_DIRECT_ACCESS) Status = bcmflash_raw_read((uiOffset/FLASH_PART_SIZE), (uiOffset % FLASH_PART_SIZE), ( unsigned char *)pBuffer, uiNumBytes); @@ -2104,7 +2104,7 @@ int BcmUpdateSectorSize(PMINI_ADAPTER Adapter, unsigned int uiSectorSize) bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Provided sector size is same as programmed in Flash\n"); Status = STATUS_SUCCESS; - goto Restore ; + goto Restore; } } } @@ -2216,7 +2216,7 @@ static int BcmInitEEPROMQueues(PMINI_ADAPTER Adapter) /* Flush the all the EEPROM queues. */ bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Flushing the queues\n"); - value =EEPROM_ALL_QUEUE_FLUSH ; + value =EEPROM_ALL_QUEUE_FLUSH; wrmalt( Adapter, SPI_FLUSH_REG, &value, sizeof(value)); value = 0; @@ -2378,7 +2378,7 @@ int BcmDeAllocFlashCSStructure(PMINI_ADAPTER psAdapter) kfree(psAdapter->psFlashCSInfo); kfree(psAdapter->psFlash2xCSInfo); kfree(psAdapter->psFlash2xVendorInfo); - return STATUS_SUCCESS ; + return STATUS_SUCCESS; } static int BcmDumpFlash2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo, PMINI_ADAPTER Adapter) @@ -2822,7 +2822,7 @@ static int BcmGetFlashCSInfo(PMINI_ADAPTER Adapter) Adapter->uiFlashLayoutMajorVersion = uiFlashLayoutMajorVersion; - return STATUS_SUCCESS ; + return STATUS_SUCCESS; } @@ -2890,7 +2890,7 @@ int BcmGetSectionValStartOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlas int SectStartOffset = 0; - SectStartOffset = INVALID_OFFSET ; + SectStartOffset = INVALID_OFFSET; if (IsSectionExistInVendorInfo(Adapter, eFlashSectionVal)) { return Adapter->psFlash2xVendorInfo->VendorSection[eFlashSectionVal].OffsetFromZeroForSectionStart; @@ -3044,7 +3044,7 @@ int BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2 default : SectEndOffset = INVALID_OFFSET; } - return SectEndOffset ; + return SectEndOffset; } /* @@ -3101,12 +3101,12 @@ int BcmFlash2xBulkRead( value = 0; wrmalt(Adapter, 0x0f000C80,&value, sizeof(value)); - Status= BeceemFlashBulkRead(Adapter, pBuffer, uiAbsoluteOffset, uiNumBytes) ; + Status= BeceemFlashBulkRead(Adapter, pBuffer, uiAbsoluteOffset, uiNumBytes); wrmalt(Adapter, 0x0f000C80, &uiTemp, sizeof(uiTemp)); if (Status) { pr_info("Flash Read Failed with Status :%d\n", Status); - return Status ; + return Status; } return Status; @@ -3173,7 +3173,7 @@ int BcmFlash2xBulkWrite( wrmalt(Adapter, 0x0f000C80, &uiTemp, sizeof(uiTemp)); if (Status) { pr_info("Flash Write failed with Status :%d\n", Status); - return Status ; + return Status; } return Status; @@ -3190,7 +3190,7 @@ int BcmFlash2xBulkWrite( **/ static int BcmGetActiveDSD(PMINI_ADAPTER Adapter) { - FLASH2X_SECTION_VAL uiHighestPriDSD = 0 ; + FLASH2X_SECTION_VAL uiHighestPriDSD = 0; uiHighestPriDSD = getHighestPriDSD(Adapter); Adapter->eActiveDSD = uiHighestPriDSD; @@ -3238,7 +3238,7 @@ static int BcmGetActiveISO(PMINI_ADAPTER Adapter) int HighestPriISO; HighestPriISO = getHighestPriISO(Adapter); - Adapter->eActiveISO = HighestPriISO ; + Adapter->eActiveISO = HighestPriISO; if (Adapter->eActiveISO == ISO_IMAGE2) Adapter->uiActiveISOOffset = (Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start); else if (Adapter->eActiveISO == ISO_IMAGE1) @@ -3276,7 +3276,7 @@ unsigned char IsOffsetWritable(PMINI_ADAPTER Adapter, unsigned int uiOffset) uiBitofSectorePermission = 2*(15 - uiSectorNum %16); //Setting Access permission - permissionBits = uiWordOfSectorPermission & (0x3 << uiBitofSectorePermission) ; + permissionBits = uiWordOfSectorPermission & (0x3 << uiBitofSectorePermission); permissionBits = (permissionBits >> uiBitofSectorePermission) & 0x3; if (permissionBits == SECTOR_READWRITE_PERMISSION) return TRUE; @@ -3334,10 +3334,10 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 PFLASH2X_CS_INFO psFlash2xCSInfo = Adapter->psFlash2xCSInfo; - FLASH2X_SECTION_VAL uiHighestPriDSD = 0 ; - FLASH2X_SECTION_VAL uiHighestPriISO= 0 ; - BOOLEAN SetActiveDSDDone = FALSE ; - BOOLEAN SetActiveISODone = FALSE ; + FLASH2X_SECTION_VAL uiHighestPriDSD = 0; + FLASH2X_SECTION_VAL uiHighestPriISO= 0; + BOOLEAN SetActiveDSDDone = FALSE; + BOOLEAN SetActiveISODone = FALSE; //For 1.x map all the section except DSD0 will be shown as not present //This part will be used by calibration tool to detect the number of DSD present in Flash. @@ -3345,17 +3345,17 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 psFlash2xBitMap->ISO_IMAGE2 = 0; psFlash2xBitMap->ISO_IMAGE1 = 0; psFlash2xBitMap->DSD0 = FLASH2X_SECTION_VALID | FLASH2X_SECTION_ACT | FLASH2X_SECTION_PRESENT; //0xF; //0000(Reseved)1(Active)0(RW)1(valid)1(present) - psFlash2xBitMap->DSD1 = 0 ; - psFlash2xBitMap->DSD2 = 0 ; - psFlash2xBitMap->VSA0 = 0 ; - psFlash2xBitMap->VSA1 = 0 ; - psFlash2xBitMap->VSA2 = 0 ; - psFlash2xBitMap->CONTROL_SECTION = 0 ; - psFlash2xBitMap->SCSI= 0 ; - psFlash2xBitMap->Reserved0 = 0 ; - psFlash2xBitMap->Reserved1 = 0 ; - psFlash2xBitMap->Reserved2 = 0 ; - return STATUS_SUCCESS ; + psFlash2xBitMap->DSD1 = 0; + psFlash2xBitMap->DSD2 = 0; + psFlash2xBitMap->VSA0 = 0; + psFlash2xBitMap->VSA1 = 0; + psFlash2xBitMap->VSA2 = 0; + psFlash2xBitMap->CONTROL_SECTION = 0; + psFlash2xBitMap->SCSI= 0; + psFlash2xBitMap->Reserved0 = 0; + psFlash2xBitMap->Reserved1 = 0; + psFlash2xBitMap->Reserved2 = 0; + return STATUS_SUCCESS; } @@ -3379,7 +3379,7 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 psFlash2xBitMap->ISO_IMAGE2 |= FLASH2X_SECTION_RO; if (SetActiveISODone == FALSE && uiHighestPriISO == ISO_IMAGE2) { - psFlash2xBitMap->ISO_IMAGE2 |= FLASH2X_SECTION_ACT ; + psFlash2xBitMap->ISO_IMAGE2 |= FLASH2X_SECTION_ACT; SetActiveISODone = TRUE; } @@ -3400,7 +3400,7 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 psFlash2xBitMap->ISO_IMAGE1 |= FLASH2X_SECTION_RO; if (SetActiveISODone == FALSE && uiHighestPriISO == ISO_IMAGE1) { - psFlash2xBitMap->ISO_IMAGE1 |= FLASH2X_SECTION_ACT ; + psFlash2xBitMap->ISO_IMAGE1 |= FLASH2X_SECTION_ACT; SetActiveISODone = TRUE; } } @@ -3424,8 +3424,8 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 } else { //Means section is writable if ((SetActiveDSDDone == FALSE) && (uiHighestPriDSD == DSD2)) { - psFlash2xBitMap->DSD2 |= FLASH2X_SECTION_ACT ; - SetActiveDSDDone =TRUE ; + psFlash2xBitMap->DSD2 |= FLASH2X_SECTION_ACT; + SetActiveDSDDone =TRUE; } } } @@ -3447,8 +3447,8 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 } else { //Means section is writable if ((SetActiveDSDDone == FALSE) && (uiHighestPriDSD == DSD1)) { - psFlash2xBitMap->DSD1 |= FLASH2X_SECTION_ACT ; - SetActiveDSDDone =TRUE ; + psFlash2xBitMap->DSD1 |= FLASH2X_SECTION_ACT; + SetActiveDSDDone =TRUE; } } @@ -3470,8 +3470,8 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 } else { //Means section is writable if ((SetActiveDSDDone == FALSE) &&(uiHighestPriDSD == DSD0)) { - psFlash2xBitMap->DSD0 |= FLASH2X_SECTION_ACT ; - SetActiveDSDDone =TRUE ; + psFlash2xBitMap->DSD0 |= FLASH2X_SECTION_ACT; + SetActiveDSDDone =TRUE; } } } @@ -3491,7 +3491,7 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 psFlash2xBitMap->VSA0 |= FLASH2X_SECTION_RO; //By Default section is Active - psFlash2xBitMap->VSA0 |= FLASH2X_SECTION_ACT ; + psFlash2xBitMap->VSA0 |= FLASH2X_SECTION_ACT; } @@ -3512,7 +3512,7 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 psFlash2xBitMap->VSA1 |= FLASH2X_SECTION_RO; //By Default section is Active - psFlash2xBitMap->VSA1 |= FLASH2X_SECTION_ACT ; + psFlash2xBitMap->VSA1 |= FLASH2X_SECTION_ACT; } @@ -3534,7 +3534,7 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 psFlash2xBitMap->VSA2 |= FLASH2X_SECTION_RO; //By Default section is Active - psFlash2xBitMap->VSA2 |= FLASH2X_SECTION_ACT ; + psFlash2xBitMap->VSA2 |= FLASH2X_SECTION_ACT; } /// @@ -3553,7 +3553,7 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 psFlash2xBitMap->SCSI |= FLASH2X_SECTION_RO; //By Default section is Active - psFlash2xBitMap->SCSI |= FLASH2X_SECTION_ACT ; + psFlash2xBitMap->SCSI |= FLASH2X_SECTION_ACT; } @@ -3574,7 +3574,7 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 psFlash2xBitMap->CONTROL_SECTION |= FLASH2X_SECTION_RO; //By Default section is Active - psFlash2xBitMap->CONTROL_SECTION |= FLASH2X_SECTION_ACT ; + psFlash2xBitMap->CONTROL_SECTION |= FLASH2X_SECTION_ACT; } @@ -3587,7 +3587,7 @@ int BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2 BcmDumpFlash2xSectionBitMap(psFlash2xBitMap); - return STATUS_SUCCESS ; + return STATUS_SUCCESS; } /** @@ -3612,14 +3612,14 @@ int BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV - Status = IsSectionWritable(Adapter, eFlash2xSectVal) ; + Status = IsSectionWritable(Adapter, eFlash2xSectVal); if (Status != TRUE ) { pr_info("Provided Section <%d> is not writable\n", eFlash2xSectVal); return STATUS_FAILURE; } - Adapter->bHeaderChangeAllowed = TRUE ; + Adapter->bHeaderChangeAllowed = TRUE; switch (eFlash2xSectVal) { case ISO_IMAGE1 : case ISO_IMAGE2 : @@ -3630,7 +3630,7 @@ int BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Given ISO<%x> already has highest priority\n", eFlash2xSectVal); - Status = STATUS_SUCCESS ; + Status = STATUS_SUCCESS; break; } @@ -3654,7 +3654,7 @@ int BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV if (Status) { pr_info("Priority has not been written properly\n"); Status = STATUS_FAILURE; - break ; + break; } HighestPriISO = getHighestPriISO(Adapter); @@ -3663,7 +3663,7 @@ int BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Given ISO<%x> already has highest priority\n", eFlash2xSectVal); - Status = STATUS_SUCCESS ; + Status = STATUS_SUCCESS; break; } @@ -3681,11 +3681,11 @@ int BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV TRUE); if (Status) { pr_info("Priority has not been written properly\n"); - break ; + break; } } else { pr_info("Signature is corrupted. Hence can't increase the priority\n"); - Status = STATUS_FAILURE ; + Status = STATUS_FAILURE; break; } break; @@ -3699,11 +3699,11 @@ int BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Given DSD<%x> already has highest priority\n", eFlash2xSectVal); - Status = STATUS_SUCCESS ; + Status = STATUS_SUCCESS; break; } - SectImagePriority = ReadDSDPriority(Adapter, HighestPriDSD) + 1 ; + SectImagePriority = ReadDSDPriority(Adapter, HighestPriDSD) + 1; if (SectImagePriority <= 0) { // This is a SPECIAL Case which will only happen if the current highest priority DSD has priority value = 0x7FFFFFFF. // We will write 1 to the current Highest priority DSD And then shall increase the priority of the requested DSD @@ -3721,7 +3721,7 @@ int BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV if (Status) { pr_info("Priority has not been written properly\n"); - break ; + break; } HighestPriDSD = getHighestPriDSD(Adapter); @@ -3730,7 +3730,7 @@ int BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Made the DSD: %x highest by reducing priority of other\n", eFlash2xSectVal); - Status = STATUS_SUCCESS ; + Status = STATUS_SUCCESS; break; } @@ -3744,16 +3744,16 @@ int BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV if (Status) { pr_info("Priority has not been written properly\n"); - break ; + break; } HighestPriDSD = getHighestPriDSD(Adapter); if ((HighestPriDSD == eFlash2xSectVal)) { - Status = STATUS_SUCCESS ; + Status = STATUS_SUCCESS; break; } - SectImagePriority = 3 ; + SectImagePriority = 3; } SectImagePriority = htonl(SectImagePriority); @@ -3765,12 +3765,12 @@ int BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV TRUE); if (Status) { pr_info("Priority has not been written properly\n"); - Status = STATUS_FAILURE ; - break ; + Status = STATUS_FAILURE; + break; } } else { pr_info("Signature is corrupted. Hence can't increase the priority\n"); - Status = STATUS_FAILURE ; + Status = STATUS_FAILURE; break; } break; @@ -3778,14 +3778,14 @@ int BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV case VSA1 : case VSA2 : //Has to be decided - break ; + break; default : - Status = STATUS_FAILURE ; + Status = STATUS_FAILURE; break; } - Adapter->bHeaderChangeAllowed = FALSE ; + Adapter->bHeaderChangeAllowed = FALSE; return Status; } @@ -3805,7 +3805,7 @@ int BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) FLASH2X_SECTION_VAL eISOReadPart = 0, eISOWritePart = 0; unsigned int uiReadOffsetWithinPart = 0, uiWriteOffsetWithinPart = 0; unsigned int uiTotalDataToCopy = 0; - BOOLEAN IsThisHeaderSector = FALSE ; + BOOLEAN IsThisHeaderSector = FALSE; unsigned int sigOffset = 0; unsigned int ISOLength = 0; unsigned int Status = STATUS_SUCCESS; @@ -3844,10 +3844,10 @@ int BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) } if (sCopySectStrut.SrcSection ==ISO_IMAGE1 && sCopySectStrut.DstSection ==ISO_IMAGE2) { - eISOReadPart = ISO_IMAGE1 ; - eISOWritePart = ISO_IMAGE2 ; + eISOReadPart = ISO_IMAGE1; + eISOWritePart = ISO_IMAGE2; uiReadOffsetWithinPart = 0; - uiWriteOffsetWithinPart = 0 ; + uiWriteOffsetWithinPart = 0; uiTotalDataToCopy =(Adapter->psFlash2xCSInfo->OffsetISOImage1Part1End) - (Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start)+ @@ -3884,30 +3884,30 @@ int BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) //Setting for write of first sector. First sector is assumed to be written in last bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Writing the signature sector\n"); - eISOReadPart = ISO_IMAGE1 ; + eISOReadPart = ISO_IMAGE1; uiReadOffsetWithinPart = 0; eISOWritePart = ISO_IMAGE2; - uiWriteOffsetWithinPart = 0 ; - IsThisHeaderSector = TRUE ; + uiWriteOffsetWithinPart = 0; + IsThisHeaderSector = TRUE; } else { - uiReadOffsetWithinPart = uiReadOffsetWithinPart + Adapter->uiSectorSize ; - uiWriteOffsetWithinPart = uiWriteOffsetWithinPart + Adapter->uiSectorSize ; + uiReadOffsetWithinPart = uiReadOffsetWithinPart + Adapter->uiSectorSize; + uiWriteOffsetWithinPart = uiWriteOffsetWithinPart + Adapter->uiSectorSize; if ((eISOReadPart == ISO_IMAGE1) && (uiReadOffsetWithinPart == (Adapter->psFlash2xCSInfo->OffsetISOImage1Part1End - Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start) )) { - eISOReadPart = ISO_IMAGE1_PART2 ; + eISOReadPart = ISO_IMAGE1_PART2; uiReadOffsetWithinPart = 0; } if ((eISOReadPart == ISO_IMAGE1_PART2) && (uiReadOffsetWithinPart == (Adapter->psFlash2xCSInfo->OffsetISOImage1Part2End - Adapter->psFlash2xCSInfo->OffsetISOImage1Part2Start))) { - eISOReadPart = ISO_IMAGE1_PART3 ; + eISOReadPart = ISO_IMAGE1_PART3; uiReadOffsetWithinPart = 0; } if ((eISOWritePart == ISO_IMAGE2) && (uiWriteOffsetWithinPart == (Adapter->psFlash2xCSInfo->OffsetISOImage2Part1End - Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start))) { - eISOWritePart = ISO_IMAGE2_PART2 ; + eISOWritePart = ISO_IMAGE2_PART2; uiWriteOffsetWithinPart = 0; } if ((eISOWritePart == ISO_IMAGE2_PART2) && (uiWriteOffsetWithinPart == (Adapter->psFlash2xCSInfo->OffsetISOImage2Part2End - Adapter->psFlash2xCSInfo->OffsetISOImage2Part2Start))) { - eISOWritePart = ISO_IMAGE2_PART3 ; + eISOWritePart = ISO_IMAGE2_PART3; uiWriteOffsetWithinPart = 0; } } @@ -3932,7 +3932,7 @@ int BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) for (i = 0; i < MAX_RW_SIZE; i++) *(Buff + sigOffset + i) = 0xFF; } - Adapter->bHeaderChangeAllowed = TRUE ; + Adapter->bHeaderChangeAllowed = TRUE; Status = BcmFlash2xBulkWrite(Adapter, (unsigned int *)Buff, @@ -3954,20 +3954,20 @@ int BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) eISOWritePart, sigOffset, MAX_RW_SIZE); - IsThisHeaderSector = FALSE ; + IsThisHeaderSector = FALSE; } //subtracting the written Data - uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize ; + uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize; } } if (sCopySectStrut.SrcSection ==ISO_IMAGE2 && sCopySectStrut.DstSection ==ISO_IMAGE1) { - eISOReadPart = ISO_IMAGE2 ; - eISOWritePart = ISO_IMAGE1 ; + eISOReadPart = ISO_IMAGE2; + eISOWritePart = ISO_IMAGE1; uiReadOffsetWithinPart = 0; - uiWriteOffsetWithinPart = 0 ; + uiWriteOffsetWithinPart = 0; uiTotalDataToCopy =(Adapter->psFlash2xCSInfo->OffsetISOImage2Part1End) - (Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start)+ @@ -4004,30 +4004,30 @@ int BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) //Setting for write of first sector. First sector is assumed to be written in last bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Writing the signature sector\n"); - eISOReadPart = ISO_IMAGE2 ; + eISOReadPart = ISO_IMAGE2; uiReadOffsetWithinPart = 0; eISOWritePart = ISO_IMAGE1; - uiWriteOffsetWithinPart = 0 ; + uiWriteOffsetWithinPart = 0; IsThisHeaderSector = TRUE; } else { - uiReadOffsetWithinPart = uiReadOffsetWithinPart + Adapter->uiSectorSize ; - uiWriteOffsetWithinPart = uiWriteOffsetWithinPart + Adapter->uiSectorSize ; + uiReadOffsetWithinPart = uiReadOffsetWithinPart + Adapter->uiSectorSize; + uiWriteOffsetWithinPart = uiWriteOffsetWithinPart + Adapter->uiSectorSize; if ((eISOReadPart == ISO_IMAGE2) && (uiReadOffsetWithinPart == (Adapter->psFlash2xCSInfo->OffsetISOImage2Part1End - Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start) )) { - eISOReadPart = ISO_IMAGE2_PART2 ; + eISOReadPart = ISO_IMAGE2_PART2; uiReadOffsetWithinPart = 0; } if ((eISOReadPart == ISO_IMAGE2_PART2) && (uiReadOffsetWithinPart == (Adapter->psFlash2xCSInfo->OffsetISOImage2Part2End - Adapter->psFlash2xCSInfo->OffsetISOImage2Part2Start))) { - eISOReadPart = ISO_IMAGE2_PART3 ; + eISOReadPart = ISO_IMAGE2_PART3; uiReadOffsetWithinPart = 0; } if ((eISOWritePart == ISO_IMAGE1) && (uiWriteOffsetWithinPart == (Adapter->psFlash2xCSInfo->OffsetISOImage1Part1End - Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start))) { - eISOWritePart = ISO_IMAGE1_PART2 ; + eISOWritePart = ISO_IMAGE1_PART2; uiWriteOffsetWithinPart = 0; } if ((eISOWritePart == ISO_IMAGE1_PART2) && (uiWriteOffsetWithinPart == (Adapter->psFlash2xCSInfo->OffsetISOImage1Part2End - Adapter->psFlash2xCSInfo->OffsetISOImage1Part2Start))) { - eISOWritePart = ISO_IMAGE1_PART3 ; + eISOWritePart = ISO_IMAGE1_PART3; uiWriteOffsetWithinPart = 0; } } @@ -4052,7 +4052,7 @@ int BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) *(Buff + sigOffset + i) = 0xFF; } - Adapter->bHeaderChangeAllowed = TRUE ; + Adapter->bHeaderChangeAllowed = TRUE; Status = BcmFlash2xBulkWrite(Adapter, (unsigned int *)Buff, eISOWritePart, @@ -4066,7 +4066,7 @@ int BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) break; } - Adapter->bHeaderChangeAllowed = FALSE ; + Adapter->bHeaderChangeAllowed = FALSE; if (IsThisHeaderSector == TRUE) { WriteToFlashWithoutSectorErase(Adapter, @@ -4074,11 +4074,11 @@ int BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) eISOWritePart, sigOffset, MAX_RW_SIZE); - IsThisHeaderSector = FALSE ; + IsThisHeaderSector = FALSE; } //subtracting the written Data - uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize ; + uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize; } @@ -4149,8 +4149,8 @@ int BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionV } } if ((eFlashSectionVal == DSD0) ||(eFlashSectionVal == DSD1) || (eFlashSectionVal == DSD2)) { - uiSignature = htonl(DSD_IMAGE_MAGIC_NUMBER) ; - uiOffset = Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader ; + uiSignature = htonl(DSD_IMAGE_MAGIC_NUMBER); + uiOffset = Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader; uiOffset += FIELD_OFFSET_IN_HEADER(PDSD_HEADER, DSDImageMagicNumber); @@ -4231,7 +4231,7 @@ int validateFlash2xReadWrite(PMINI_ADAPTER Adapter, PFLASH2X_READWRITE psFlash2x //since this uiSectEndoffset is the size of iso Image. hence for calculating the vitual endoffset //it should be added in startoffset. so that check done in last of this function can be valued. - uiSectEndOffset = uiSectStartOffset + uiSectEndOffset ; + uiSectEndOffset = uiSectStartOffset + uiSectEndOffset; bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Total size of the ISO Image :%x\n", uiSectEndOffset); @@ -4261,7 +4261,7 @@ int validateFlash2xReadWrite(PMINI_ADAPTER Adapter, PFLASH2X_READWRITE psFlash2x int IsFlash2x(PMINI_ADAPTER Adapter) { if (Adapter->uiFlashLayoutMajorVersion >= FLASH_2X_MAJOR_NUMBER) - return TRUE ; + return TRUE; else return FALSE; } @@ -4286,7 +4286,7 @@ static int GetFlashBaseAddr(PMINI_ADAPTER Adapter) if (Adapter->uiFlashLayoutMajorVersion && (Adapter->bFlashRawRead == FALSE) && !((Adapter->uiFlashLayoutMajorVersion == 1) && (Adapter->uiFlashLayoutMinorVersion == 1)) ) - uiBaseAddr = Adapter->uiFlashBaseAdd ; + uiBaseAddr = Adapter->uiFlashBaseAdd; else uiBaseAddr = FLASH_CONTIGIOUS_START_ADDR_AFTER_INIT; } else { @@ -4302,7 +4302,7 @@ static int GetFlashBaseAddr(PMINI_ADAPTER Adapter) uiBaseAddr = FLASH_CONTIGIOUS_START_ADDR_BEFORE_INIT; } - return uiBaseAddr ; + return uiBaseAddr; } /** BcmCopySection :- This API is used to copy the One section in another. Both section should @@ -4330,7 +4330,7 @@ int BcmCopySection(PMINI_ADAPTER Adapter, unsigned int BuffSize = 0; unsigned int BytesToBeCopied = 0; unsigned char *pBuff = NULL; - int Status = STATUS_SUCCESS ; + int Status = STATUS_SUCCESS; if (SrcSection == DstSection) { pr_info("Source and Destination should be different ...try again\n"); return -EINVAL; @@ -4372,7 +4372,7 @@ int BcmCopySection(PMINI_ADAPTER Adapter, if (numOfBytes > Adapter->uiSectorSize ) BuffSize = Adapter->uiSectorSize; else - BuffSize = numOfBytes ; + BuffSize = numOfBytes; pBuff = kzalloc(BuffSize, GFP_KERNEL); if (pBuff == NULL) { @@ -4381,11 +4381,11 @@ int BcmCopySection(PMINI_ADAPTER Adapter, } - BytesToBeCopied = Adapter->uiSectorSize ; + BytesToBeCopied = Adapter->uiSectorSize; if (offset % Adapter->uiSectorSize) BytesToBeCopied = Adapter->uiSectorSize - (offset % Adapter->uiSectorSize); if (BytesToBeCopied > numOfBytes) - BytesToBeCopied = numOfBytes ; + BytesToBeCopied = numOfBytes; @@ -4406,16 +4406,16 @@ int BcmCopySection(PMINI_ADAPTER Adapter, break; } offset = offset + BytesToBeCopied; - numOfBytes = numOfBytes - BytesToBeCopied ; + numOfBytes = numOfBytes - BytesToBeCopied; if (numOfBytes) { if (numOfBytes > Adapter->uiSectorSize ) BytesToBeCopied = Adapter->uiSectorSize; else BytesToBeCopied = numOfBytes; } - }while (numOfBytes > 0) ; + }while (numOfBytes > 0); kfree(pBuff); - Adapter->bHeaderChangeAllowed = FALSE ; + Adapter->bHeaderChangeAllowed = FALSE; return Status; } @@ -4434,7 +4434,7 @@ int BcmCopySection(PMINI_ADAPTER Adapter, int SaveHeaderIfPresent(PMINI_ADAPTER Adapter, unsigned char *pBuff, unsigned int uiOffset) { unsigned int offsetToProtect = 0, HeaderSizeToProtect = 0; - BOOLEAN bHasHeader = FALSE ; + BOOLEAN bHasHeader = FALSE; unsigned char *pTempBuff = NULL; unsigned int uiSectAlignAddr = 0; unsigned int sig = 0; @@ -4450,7 +4450,7 @@ int SaveHeaderIfPresent(PMINI_ADAPTER Adapter, unsigned char *pBuff, unsigned in //offset from the sector boundary having the header map offsetToProtect = Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader % Adapter->uiSectorSize; HeaderSizeToProtect = sizeof(DSD_HEADER); - bHasHeader = TRUE ; + bHasHeader = TRUE; } if (uiSectAlignAddr == BcmGetSectionValStartOffset(Adapter, ISO_IMAGE1) || @@ -4491,7 +4491,7 @@ int SaveHeaderIfPresent(PMINI_ADAPTER Adapter, unsigned char *pBuff, unsigned in Adapter->bSigCorrupted = FALSE; } - return STATUS_SUCCESS ; + return STATUS_SUCCESS; } /** @@ -4508,7 +4508,7 @@ static int BcmDoChipSelect(PMINI_ADAPTER Adapter, unsigned int offset) unsigned int GPIOConfig = 0; unsigned int PartNum = 0; - ChipNum = offset / FLASH_PART_SIZE ; + ChipNum = offset / FLASH_PART_SIZE; // // Chip Select mapping to enable flash0. @@ -4529,7 +4529,7 @@ static int BcmDoChipSelect(PMINI_ADAPTER Adapter, unsigned int offset) return STATUS_SUCCESS; //bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Selected Chip :%x\n", ChipNum); - Adapter->SelectedChip = ChipNum ; + Adapter->SelectedChip = ChipNum; //bit[13..12] will select the appropriate chip rdmalt(Adapter, FLASH_CONFIG_REG, &FlashConfig, 4); @@ -4599,7 +4599,7 @@ int ReadDSDSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd) bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "DSD SIG :%x\n", uiDSDsig); - return uiDSDsig ; + return uiDSDsig; } int ReadDSDPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd) { @@ -4627,23 +4627,23 @@ FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter) { int DSDHighestPri = STATUS_FAILURE; int DsdPri = 0; - FLASH2X_SECTION_VAL HighestPriDSD = 0 ; + FLASH2X_SECTION_VAL HighestPriDSD = 0; if (IsSectionWritable(Adapter, DSD2)) { DSDHighestPri = ReadDSDPriority(Adapter, DSD2); - HighestPriDSD = DSD2 ; + HighestPriDSD = DSD2; } if (IsSectionWritable(Adapter, DSD1)) { DsdPri = ReadDSDPriority(Adapter, DSD1); if (DSDHighestPri < DsdPri) { - DSDHighestPri = DsdPri ; + DSDHighestPri = DsdPri; HighestPriDSD = DSD1; } } if (IsSectionWritable(Adapter, DSD0)) { DsdPri = ReadDSDPriority(Adapter, DSD0); if (DSDHighestPri < DsdPri) { - DSDHighestPri = DsdPri ; + DSDHighestPri = DsdPri; HighestPriDSD = DSD0; } } @@ -4651,7 +4651,7 @@ FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter) bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Highest DSD :%x , and its Pri :%x\n", HighestPriDSD, DSDHighestPri); - return HighestPriDSD ; + return HighestPriDSD; } int ReadISOSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso) @@ -4677,7 +4677,7 @@ int ReadISOSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso) bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "ISO SIG :%x\n", uiISOsig); - return uiISOsig ; + return uiISOsig; } int ReadISOPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso) { @@ -4703,16 +4703,16 @@ FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter) { int ISOHighestPri = STATUS_FAILURE; int ISOPri = 0; - FLASH2X_SECTION_VAL HighestPriISO = NO_SECTION_VAL ; + FLASH2X_SECTION_VAL HighestPriISO = NO_SECTION_VAL; if (IsSectionWritable(Adapter, ISO_IMAGE2)) { ISOHighestPri = ReadISOPriority(Adapter, ISO_IMAGE2); - HighestPriISO = ISO_IMAGE2 ; + HighestPriISO = ISO_IMAGE2; } if (IsSectionWritable(Adapter, ISO_IMAGE1)) { ISOPri = ReadISOPriority(Adapter, ISO_IMAGE1); if (ISOHighestPri < ISOPri) { - ISOHighestPri = ISOPri ; + ISOHighestPri = ISOPri; HighestPriISO = ISO_IMAGE1; } } @@ -4720,7 +4720,7 @@ FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter) bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Highest ISO :%x and its Pri :%x\n", HighestPriISO, ISOHighestPri); - return HighestPriISO ; + return HighestPriISO; } int WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter, unsigned int *pBuff, @@ -4786,57 +4786,57 @@ int WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter, BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section) { - BOOLEAN SectionPresent = FALSE ; + BOOLEAN SectionPresent = FALSE; switch (section) { case ISO_IMAGE1 : if ((Adapter->psFlash2xCSInfo->OffsetISOImage1Part1Start != UNINIT_PTR_IN_CS) && (IsNonCDLessDevice(Adapter) == FALSE)) - SectionPresent = TRUE ; + SectionPresent = TRUE; break; case ISO_IMAGE2 : if ((Adapter->psFlash2xCSInfo->OffsetISOImage2Part1Start != UNINIT_PTR_IN_CS) && (IsNonCDLessDevice(Adapter) == FALSE)) - SectionPresent = TRUE ; + SectionPresent = TRUE; break; case DSD0 : if (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSDStart != UNINIT_PTR_IN_CS) - SectionPresent = TRUE ; + SectionPresent = TRUE; break; case DSD1 : if (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD1Start != UNINIT_PTR_IN_CS) - SectionPresent = TRUE ; + SectionPresent = TRUE; break; case DSD2 : if (Adapter->psFlash2xCSInfo->OffsetFromZeroForDSD2Start != UNINIT_PTR_IN_CS) - SectionPresent = TRUE ; + SectionPresent = TRUE; break; case VSA0 : if (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSAStart != UNINIT_PTR_IN_CS) - SectionPresent = TRUE ; + SectionPresent = TRUE; break; case VSA1 : if (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA1Start != UNINIT_PTR_IN_CS) - SectionPresent = TRUE ; + SectionPresent = TRUE; break; case VSA2 : if (Adapter->psFlash2xCSInfo->OffsetFromZeroForVSA2Start != UNINIT_PTR_IN_CS) - SectionPresent = TRUE ; + SectionPresent = TRUE; break; case SCSI : if (Adapter->psFlash2xCSInfo->OffsetFromZeroForScsiFirmware != UNINIT_PTR_IN_CS) - SectionPresent = TRUE ; + SectionPresent = TRUE; break; case CONTROL_SECTION : if (Adapter->psFlash2xCSInfo->OffsetFromZeroForControlSectionStart != UNINIT_PTR_IN_CS) - SectionPresent = TRUE ; + SectionPresent = TRUE; break; default : pr_info("Section Does not exist in Flash 2.x\n"); SectionPresent = FALSE; } - return SectionPresent ; + return SectionPresent; } int IsSectionWritable(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL Section) { @@ -4857,7 +4857,7 @@ int IsSectionWritable(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL Section) } Status = IsOffsetWritable(Adapter, offset); - return Status ; + return Status; } static int CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal) @@ -4881,11 +4881,11 @@ static int CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect pBuff = kzalloc(MAX_RW_SIZE, GFP_KERNEL); if (pBuff == NULL) { pr_info("Can't allocate memory\n"); - return -ENOMEM ; + return -ENOMEM; } uiOffset = Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER); - uiOffset -= MAX_RW_SIZE ; + uiOffset -= MAX_RW_SIZE; BcmFlash2xBulkRead(Adapter, (unsigned int *)pBuff, eFlash2xSectionVal, uiOffset, MAX_RW_SIZE); @@ -4920,7 +4920,7 @@ static int CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect kfree(pBuff); bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Corrupted the signature\n"); - return STATUS_SUCCESS ; + return STATUS_SUCCESS; } static int CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal) @@ -4940,7 +4940,7 @@ static int CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect pBuff = kzalloc(MAX_RW_SIZE, GFP_KERNEL); if (pBuff == NULL) { pr_info("Can't allocate memory\n"); - return -ENOMEM ; + return -ENOMEM; } uiOffset = 0; @@ -4967,7 +4967,7 @@ static int CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, pBuff, MAX_RW_SIZE); kfree(pBuff); - return STATUS_SUCCESS ; + return STATUS_SUCCESS; } BOOLEAN IsNonCDLessDevice(PMINI_ADAPTER Adapter) @@ -4975,5 +4975,5 @@ BOOLEAN IsNonCDLessDevice(PMINI_ADAPTER Adapter) if (Adapter->psFlash2xCSInfo->IsCDLessDeviceBootSig == NON_CDLESS_DEVICE_BOOT_SIG) return TRUE; else - return FALSE ; + return FALSE; } diff --git a/drivers/staging/bcm/nvm.h b/drivers/staging/bcm/nvm.h index e6b4a98..6c7d600 100644 --- a/drivers/staging/bcm/nvm.h +++ b/drivers/staging/bcm/nvm.h @@ -107,7 +107,7 @@ typedef struct _FLASH_2X_CS_INFO { // magic number as 0xBECE-F1A5 - F1A5 for "flas-h" unsigned int MagicNumber; - unsigned int FlashLayoutVersion ; + unsigned int FlashLayoutVersion; // ISO Image/Format/BuildTool versioning unsigned int ISOImageVersion; @@ -118,7 +118,7 @@ typedef struct _FLASH_2X_CS_INFO { // ISO Image1 Part1/SCSI Firmware/Flash Bootloader Start offset, size unsigned int OffsetFromZeroForPart1ISOImage; unsigned int OffsetFromZeroForScsiFirmware; - unsigned int SizeOfScsiFirmware ; + unsigned int SizeOfScsiFirmware; // ISO Image1 Part2 start offset unsigned int OffsetFromZeroForPart2ISOImage; -- 1.7.8.111.gad25c.dirty _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel