lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: brcm80211: fix checkpatch errors 'assignment in if condition'

Browse Source 
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jason Cooper
2010-09-30 15:15:35 -04:00
committed by Greg Kroah-Hartman
parent eb7f37b3d5
commit c74c95cd1f
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/brcm80211/brcmfmac/bcmsdh.c
View File

@@ -58,8 +58,8 @@ bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq)
{ {
bcmsdh_info_t *bcmsdh; bcmsdh_info_t *bcmsdh;
if ((bcmsdh = bcmsdh = (bcmsdh_info_t *) MALLOC(osh, sizeof(bcmsdh_info_t));
(bcmsdh_info_t *) MALLOC(osh, sizeof(bcmsdh_info_t))) == NULL) { if (bcmsdh == NULL) {
BCMSDH_ERROR(("bcmsdh_attach: out of memory, " BCMSDH_ERROR(("bcmsdh_attach: out of memory, "
"malloced %d bytes\n", MALLOCED(osh))); "malloced %d bytes\n", MALLOCED(osh)));
return NULL; return NULL;
@@ -69,7 +69,8 @@ bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq)
/* save the handler locally */ /* save the handler locally */
l_bcmsdh = bcmsdh; l_bcmsdh = bcmsdh;
if (!(bcmsdh->sdioh = sdioh_attach(osh, cfghdl, irq))) { bcmsdh->sdioh = sdioh_attach(osh, cfghdl, irq);
if (!bcmsdh->sdioh) {
bcmsdh_detach(osh, bcmsdh); bcmsdh_detach(osh, bcmsdh);
return NULL; return NULL;
} }
@@ -317,7 +318,8 @@ int bcmsdh_cis_read(void *sdh, uint func, uint8 * cis, uint length)
if (ascii) { if (ascii) {
/* Move binary bits to tmp and format them /* Move binary bits to tmp and format them
into the provided buffer. */ into the provided buffer. */
if ((tmp_buf = (uint8 *) MALLOC(bcmsdh->osh, length)) == NULL) { tmp_buf = (uint8 *) MALLOC(bcmsdh->osh, length);
if (tmp_buf == NULL) {
BCMSDH_ERROR(("%s: out of memory\n", __func__)); BCMSDH_ERROR(("%s: out of memory\n", __func__));
return BCME_NOMEM; return BCME_NOMEM;
} }
@@ -420,7 +422,8 @@ uint32 bcmsdh_reg_write(void *sdh, uint32 addr, uint size, uint32 data)
ASSERT(bcmsdh->init_success); ASSERT(bcmsdh->init_success);
if (bar0 != bcmsdh->sbwad) { if (bar0 != bcmsdh->sbwad) {
if ((err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0))) err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0);
if (err)
return err; return err;
bcmsdh->sbwad = bar0; bcmsdh->sbwad = bar0;
@@ -471,7 +474,8 @@ bcmsdh_recv_buf(void *sdh, uint32 addr, uint fn, uint flags,
return BCME_UNSUPPORTED; return BCME_UNSUPPORTED;
if (bar0 != bcmsdh->sbwad) { if (bar0 != bcmsdh->sbwad) {
if ((err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0))) err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0);
if (err)
return err; return err;
bcmsdh->sbwad = bar0; bcmsdh->sbwad = bar0;
@@ -515,7 +519,8 @@ bcmsdh_send_buf(void *sdh, uint32 addr, uint fn, uint flags,
return BCME_UNSUPPORTED; return BCME_UNSUPPORTED;
if (bar0 != bcmsdh->sbwad) { if (bar0 != bcmsdh->sbwad) {
if ((err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0))) err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0);
if (err)
return err; return err;
bcmsdh->sbwad = bar0; bcmsdh->sbwad = bar0;