kernel/linux.git/drivers/staging/bcm, branch v3.15.2

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2014-04-02T23:23:38+00:00

Pull trivial tree updates from Jiri Kosina: "Usual rocket science -- mostly documentation and comment updates" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: sparse: fix comment doc: fix double words isdn: capi: fix "CAPI_VERSION" comment doc: DocBook: Fix typos in xml and template file Bluetooth: add module name for btwilink driver core: unexport static function create_syslog_header mmc: core: typo fix in printk specifier ARM: spear: clean up editing mistake net-sysfs: fix comment typo 'CONFIG_SYFS' doc: Insert MODULE_ in module-signing macros Documentation: update URL to hfsplus Technote 1150 gpio: update path to documentation ixgbe: Fix format string in ixgbe_fcoe. Kconfig: Remove useless "default N" lines user_namespace.c: Remove duplicated word in comment CREDITS: fix formatting treewide: Fix typo in Documentation/DocBook mm: Fix warning on make htmldocs caused by slab.c ata: ata-samsung_cf: cleanup in header file idr: remove unused prototype of idr_free()

Staging: bcm: Remove unnecessary parentheses

2014-03-19T20:53:56+00:00

This patch fixes checkpatch.pl warning Unnecessary parentheses in bcm driver. Signed-off-by: Tugce Sirin Signed-off-by: Greg Kroah-Hartman

staging: bcm: Fix line over 80 characters.

2014-03-19T16:32:11+00:00

Fix checkpatch.pl issues with line over 80 characters in Adapter.h Signed-off-by: Heena Sirwani Signed-off-by: Greg Kroah-Hartman

Staging: bcm: CmHost: moved and removed declarations and tmp bracing.

2014-03-18T23:22:27+00:00

Firstly, some background is needed to confirm the validity of this patch as error fixing. It seems the developer when writing this driver from scratch, used what are known to me as error suppressors in the form of extra tmp bracing added to the case labels. They aid during construction time, but are not intended to remain. In this scenario there are declarations occupying space only reserved for statements. If these tmp braces were to be removed before the declarations in question were reassigned to there proper place in the funtion, compile time errors would result. So, having that said, I moved the declarations, UINT uiSearchRuleIndex = 0; and ULONG ulSFID;, and also deleted the duplicates thereof from the switch/case statement. Removed temporary bracing from case labels. Removed new lines as needed. Properly indented case breaks. Added /* FALLTHROUGH */ comments to switch/case. Signed-off-by: Gary Rookard Signed-off-by: Greg Kroah-Hartman

staging: bcm: Remove unneeded boolean comparisons and reflow lines

2014-03-18T18:48:42+00:00

Removes needless boolean TRUE and false comparisons and reflows some lines to eliminate over 80 character if statments. Signed-off-by: Jade Bilkey Signed-off-by: Greg Kroah-Hartman

staging: bcm: Fix space before semicolon

2014-03-18T18:48:42+00:00

Fixes several checkpatch WARNING: space prohibited before semicolon Signed-off-by: Jade Bilkey Signed-off-by: Greg Kroah-Hartman

staging: bcm: Fix lines over 80 characters

2014-03-18T18:48:42+00:00

Signed-off-by: Jade Bilkey Signed-off-by: Greg Kroah-Hartman

staging: bcm: Cleanup unneeded boolean comparisons

2014-03-18T18:48:42+00:00

Cleans up a few needless comparisons with booleans and cleans up an interupt handler to take advantage of earlier bailout shortcircuit. Signed-off-by: Jade Bilkey Signed-off-by: Greg Kroah-Hartman

staging: bcm: Cleanup CreateInterruptUrb() and StartInterruptUrb()

2014-03-18T18:48:42+00:00

Fixes checkpatch.pl warnings and errors: ERROR: that open brace { should be on the previous line + if (!psIntfAdapter->psInterruptUrb) + { WARNING: line over 80 characters + BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot allocate interrupt urb"); ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot allocate interrupt urb"); ^ ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot allocate interrupt urb"); ^ WARNING: line over 80 characters + psIntfAdapter->ulInterruptData; WARNING: line over 80 characters + sizeof(psIntfAdapter->ulInterruptData); WARNING: line over 80 characters + psIntfAdapter->sIntrIn.int_in_endpointAddr); WARNING: line over 80 characters + psIntfAdapter->psInterruptUrb->transfer_buffer, WARNING: line over 80 characters + psIntfAdapter->psInterruptUrb->transfer_buffer_length, WARNING: line over 80 characters + BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt Interval: %d\n", ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt Interval: %d\n", ^ ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt Interval: %d\n", ^ ERROR: that open brace { should be on the previous line + if( false == psIntfAdapter->psAdapter->device_removed && + false == psIntfAdapter->psAdapter->bEndPointHalted && + false == psIntfAdapter->bSuspended && + false == psIntfAdapter->bPreparingForBusSuspend && + false == psIntfAdapter->psAdapter->StopAllXaction) + { ERROR: space prohibited after that open parenthesis '(' + if( false == psIntfAdapter->psAdapter->device_removed && ERROR: space required before the open parenthesis '(' + if( false == psIntfAdapter->psAdapter->device_removed && WARNING: line over 80 characters + status = usb_submit_urb(psIntfAdapter->psInterruptUrb, GFP_ATOMIC); ERROR: that open brace { should be on the previous line + if (status) + { WARNING: line over 80 characters + BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot send int urb %d\n", status); ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot send int urb %d\n", status); ^ ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Cannot send int urb %d\n", status); ^ ERROR: that open brace { should be on the previous line + if(status == -EPIPE) + { ERROR: space required before the open parenthesis '(' + if(status == -EPIPE) WARNING: line over 80 characters + psIntfAdapter->psAdapter->bEndPointHalted = TRUE ; WARNING: space prohibited before semicolon + psIntfAdapter->psAdapter->bEndPointHalted = TRUE ; WARNING: line over 80 characters + wake_up(&psIntfAdapter->psAdapter->tx_packet_wait_queue); Signed-off-by: Jade Bilkey Signed-off-by: Greg Kroah-Hartman

staging: bcm: Cleanup switch statement

2014-03-18T18:48:42+00:00

Fixes checkpatch.pl warnings and errors: ERROR: switch and case should be at the same indent + switch (status) { [...] + case STATUS_SUCCESS: [...] + case -ENOENT : [...] + case -EINPROGRESS: [...] + case -EPIPE: [...] + case -ECONNRESET: //URB got unlinked. + case -ESHUTDOWN: // hardware gone. this is the serious problem. [...] + case -ENODEV : //Device got removed + case -EINVAL : //Some thing very bad happened with the URB. No description is available. [...] + default: ERROR: that open brace { should be on the previous line + if ( urb->actual_length ) + { ERROR: space prohibited after that open parenthesis '(' + if ( urb->actual_length ) ERROR: space prohibited before that close parenthesis ')' + if ( urb->actual_length ) ERROR: that open brace { should be on the previous line + if(psIntfAdapter->ulInterruptData[1] & 0xFF) + { ERROR: space required before the open parenthesis '(' + if(psIntfAdapter->ulInterruptData[1] & 0xFF) WARNING: line over 80 characters + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL, "Got USIM interrupt"); ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL, "Got USIM interrupt"); ^ ERROR: that open brace { should be on the previous line + if(psIntfAdapter->ulInterruptData[1] & 0xFF00) + { ERROR: space required before the open parenthesis '(' + if(psIntfAdapter->ulInterruptData[1] & 0xFF00) WARNING: line over 80 characters + (psIntfAdapter->ulInterruptData[1] & 0xFF00) >> 8); WARNING: space prohibited between function name and open parenthesis '(' + atomic_set (&Adapter->uiMBupdate, TRUE); WARNING: line over 80 characters + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL, "TX mailbox contains %d", ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL, "TX mailbox contains %d", ^ + atomic_read(&Adapter->CurrNumFreeTxDesc)); ERROR: that open brace { should be on the previous line + if(psIntfAdapter->ulInterruptData[1] >> 16) + { ERROR: space required before the open parenthesis '(' + if(psIntfAdapter->ulInterruptData[1] >> 16) ERROR: spaces required around that '=' (ctx:VxE) + Adapter->CurrNumRecvDescs= ^ WARNING: line over 80 characters + (psIntfAdapter->ulInterruptData[1] >> 16); + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"RX mailbox contains %d", ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"RX mailbox contains %d", ^ ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"RX mailbox contains %d", ^ ERROR: that open brace { should be on the previous line + if(Adapter->fw_download_done && + !Adapter->downloadDDR && + atomic_read(&Adapter->CurrNumFreeTxDesc)) + { ERROR: space required before the open parenthesis '(' + if(Adapter->fw_download_done && ERROR: spaces required around that '+=' (ctx:WxV) + psIntfAdapter->psAdapter->downloadDDR +=1; ^ ERROR: that open brace { should be on the previous line + if(false == Adapter->waiting_to_fw_download_done) + { ERROR: space required before the open parenthesis '(' + if(false == Adapter->waiting_to_fw_download_done) ERROR: that open brace { should be on the previous line + if(!atomic_read(&Adapter->TxPktAvail)) + { ERROR: space required before the open parenthesis '(' + if(!atomic_read(&Adapter->TxPktAvail)) WARNING: line over 80 characters + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Firing interrupt in URB"); ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Firing interrupt in URB"); ^ ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Firing interrupt in URB"); ^ ERROR: space prohibited before that ':' (ctx:WxE) + case -ENOENT : ^ WARNING: line over 80 characters + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"URB has got disconnected ...."); ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"URB has got disconnected ...."); ^ ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"URB has got disconnected ...."); ^ WARNING: space prohibited before semicolon + return ; WARNING: line over 80 characters + //This situation may happened when URBunlink is used. for detail check usb_unlink_urb documentation. ERROR: do not use C99 // comments + //This situation may happened when URBunlink is used. for detail check usb_unlink_urb documentation. WARNING: line over 80 characters + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Impossibe condition has occurred... something very bad is going on"); ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Impossibe condition has occurred... something very bad is going on"); ^ ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Impossibe condition has occurred... something very bad is going on"); ^ WARNING: space prohibited before semicolon + break ; ERROR: do not use C99 // comments + //return; WARNING: line over 80 characters + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt IN endPoint has got halted/stalled...need to clear this"); ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt IN endPoint has got halted/stalled...need to clear this"); ^ ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt IN endPoint has got halted/stalled...need to clear this"); ^ WARNING: space prohibited before semicolon + Adapter->bEndPointHalted = TRUE ; WARNING: space prohibited before semicolon + urb->status = STATUS_SUCCESS ; ERROR: do not use C99 // comments + case -ECONNRESET: //URB got unlinked. WARNING: line over 80 characters + case -ESHUTDOWN: // hardware gone. this is the serious problem. ERROR: do not use C99 // comments + case -ESHUTDOWN: // hardware gone. this is the serious problem. WARNING: line over 80 characters + //Occurs only when something happens with the host controller device ERROR: code indent should use tabs where possible +^I ^I^I^I^I^I^I//Occurs only when something happens with the host controller device$ WARNING: please, no space before tabs +^I ^I^I^I^I^I^I//Occurs only when something happens with the host controller device$ ERROR: do not use C99 // comments + //Occurs only when something happens with the host controller device ERROR: do not use C99 // comments + case -ENODEV : //Device got removed ERROR: space prohibited before that ':' (ctx:WxW) + case -ENODEV : //Device got removed ^ WARNING: line over 80 characters + case -EINVAL : //Some thing very bad happened with the URB. No description is available. ERROR: do not use C99 // comments + case -EINVAL : //Some thing very bad happened with the URB. No description is available. ERROR: space prohibited before that ':' (ctx:WxW) + case -EINVAL : //Some thing very bad happened with the URB. No description is available. ^ WARNING: line over 80 characters + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"interrupt urb error %d", status); ERROR: code indent should use tabs where possible +^I ^IBCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"interrupt urb error %d", status);$ WARNING: please, no space before tabs +^I ^IBCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"interrupt urb error %d", status);$ ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"interrupt urb error %d", status); ^ ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"interrupt urb error %d", status); ^ WARNING: space prohibited before semicolon + urb->status = STATUS_SUCCESS ; WARNING: space prohibited before semicolon + break ; ERROR: do not use C99 // comments + //return; ERROR: spaces required around that ':' (ctx:VxE) + default: ^ WARNING: line over 80 characters + //This is required to check what is the defaults conditions when it occurs.. ERROR: do not use C99 // comments + //This is required to check what is the defaults conditions when it occurs.. WARNING: line over 80 characters + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,"GOT DEFAULT INTERRUPT URB STATUS :%d..Please Analyze it...", status); ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,"GOT DEFAULT INTERRUPT URB STATUS :%d..Please Analyze it...", status); ^ ERROR: space required after that ',' (ctx:VxV) + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,"GOT DEFAULT INTERRUPT URB STATUS :%d..Please Analyze it...", status); ^ Signed-off-by: Jade Bilkey Signed-off-by: Greg Kroah-Hartman