Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ea54c9f authored by Henry Ptasinski's avatar Henry Ptasinski Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: fix for 'remove unnecessary braces' checkpatch warning 



Removed unnecessary braces in single-statement blocks. Used the tools
'uncrustify' and 'coccinelle' to accomplish this.

Signed-off-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5973f660

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+8 −12
Original line number Diff line number Diff line
@@ -218,10 +218,9 @@ static int brcmf_sdioh_enablefuncs(struct sdioh_info *sd) 
	sdio_claim_host(gInstance->func[1]);

	err_ret = sdio_enable_func(gInstance->func[1]);

	sdio_release_host(gInstance->func[1]);

	if (err_ret) {

	if (err_ret)

		sd_err(("brcmf_sdioh_enablefuncs: Failed to enable F1 "

			"Err: 0x%08x\n", err_ret));

	}



	return false;

}
@@ -763,35 +762,32 @@ brcmf_sdioh_request_word(struct sdioh_info *sd, uint cmd_type, uint rw, 
	sdio_claim_host(gInstance->func[func]);



	if (rw) {		/* CMD52 Write */

		if (nbytes == 4) {

		if (nbytes == 4)

			sdio_writel(gInstance->func[func], *word, addr,

				    &err_ret);

		} else if (nbytes == 2) {

		else if (nbytes == 2)

			sdio_writew(gInstance->func[func], (*word & 0xFFFF),

				    addr, &err_ret);

		} else {

		else

			sd_err(("%s: Invalid nbytes: %d\n", __func__, nbytes));

		}

	} else {		/* CMD52 Read */

		if (nbytes == 4) {

		if (nbytes == 4)

			*word =

			    sdio_readl(gInstance->func[func], addr, &err_ret);

		} else if (nbytes == 2) {

		else if (nbytes == 2)

			*word =

			    sdio_readw(gInstance->func[func], addr,

				       &err_ret) & 0xFFFF;

		} else {

		else

			sd_err(("%s: Invalid nbytes: %d\n", __func__, nbytes));

	}

	}



	/* Release host controller */

	sdio_release_host(gInstance->func[func]);



	if (err_ret) {

	if (err_ret)

		sd_err(("brcmf: Failed to %s word, Err: 0x%08x\n",

			rw ? "Write" : "Read", err_ret));

	}



	return err_ret;

}

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+20 −25
Original line number Diff line number Diff line
@@ -284,18 +284,17 @@ bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q, 
		/* Evict packet according to discard policy */

		p = discard_oldest ? brcmu_pktq_pdeq(q, eprec) :

			brcmu_pktq_pdeq_tail(q, eprec);

		if (p == NULL) {

		if (p == NULL)

			BRCMF_ERROR(("%s: brcmu_pktq_penq() failed, oldest %d.",

				     __func__, discard_oldest));

		}



		brcmu_pkt_buf_free_skb(p);

	}



	/* Enqueue */

	p = brcmu_pktq_penq(q, prec, pkt);

	if (p == NULL) {

	if (p == NULL)

		BRCMF_ERROR(("%s: brcmu_pktq_penq() failed.", __func__));

	}



	return p != NULL;

}
@@ -542,20 +541,19 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) 


	case BRCMF_E_ASSOC:

	case BRCMF_E_REASSOC:

		if (status == BRCMF_E_STATUS_SUCCESS) {

		if (status == BRCMF_E_STATUS_SUCCESS)

			BRCMF_EVENT(("MACEVENT: %s, MAC %s, SUCCESS\n",

				     event_name, eabuf));

		} else if (status == BRCMF_E_STATUS_TIMEOUT) {

		else if (status == BRCMF_E_STATUS_TIMEOUT)

			BRCMF_EVENT(("MACEVENT: %s, MAC %s, TIMEOUT\n",

				     event_name, eabuf));

		} else if (status == BRCMF_E_STATUS_FAIL) {

		else if (status == BRCMF_E_STATUS_FAIL)

			BRCMF_EVENT(("MACEVENT: %s, MAC %s, FAILURE,"

				     " reason %d\n", event_name, eabuf,

				     (int)reason));

		} else {

		else

			BRCMF_EVENT(("MACEVENT: %s, MAC %s, unexpected status "

				     "%d\n", event_name, eabuf, (int)status));

		}

		break;



	case BRCMF_E_DEAUTH_IND:
@@ -574,16 +572,16 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) 
			sprintf(err_msg, "AUTH unknown: %d", (int)auth_type);

			auth_str = err_msg;

		}

		if (event_type == BRCMF_E_AUTH_IND) {

		if (event_type == BRCMF_E_AUTH_IND)

			BRCMF_EVENT(("MACEVENT: %s, MAC %s, %s\n", event_name,

				     eabuf, auth_str));

		} else if (status == BRCMF_E_STATUS_SUCCESS) {

		else if (status == BRCMF_E_STATUS_SUCCESS)

			BRCMF_EVENT(("MACEVENT: %s, MAC %s, %s, SUCCESS\n",

				     event_name, eabuf, auth_str));

		} else if (status == BRCMF_E_STATUS_TIMEOUT) {

		else if (status == BRCMF_E_STATUS_TIMEOUT)

			BRCMF_EVENT(("MACEVENT: %s, MAC %s, %s, TIMEOUT\n",

				     event_name, eabuf, auth_str));

		} else if (status == BRCMF_E_STATUS_FAIL) {

		else if (status == BRCMF_E_STATUS_FAIL) {

			BRCMF_EVENT(("MACEVENT: %s, MAC %s, %s, FAILURE, "

				     "reason %d\n",

				     event_name, eabuf, auth_str, (int)reason));
@@ -594,29 +592,27 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) 
	case BRCMF_E_JOIN:

	case BRCMF_E_ROAM:

	case BRCMF_E_SET_SSID:

		if (status == BRCMF_E_STATUS_SUCCESS) {

		if (status == BRCMF_E_STATUS_SUCCESS)

			BRCMF_EVENT(("MACEVENT: %s, MAC %s\n", event_name,

				     eabuf));

		} else if (status == BRCMF_E_STATUS_FAIL) {

		else if (status == BRCMF_E_STATUS_FAIL)

			BRCMF_EVENT(("MACEVENT: %s, failed\n", event_name));

		} else if (status == BRCMF_E_STATUS_NO_NETWORKS) {

		else if (status == BRCMF_E_STATUS_NO_NETWORKS)

			BRCMF_EVENT(("MACEVENT: %s, no networks found\n",

				     event_name));

		} else {

		else

			BRCMF_EVENT(("MACEVENT: %s, unexpected status %d\n",

				     event_name, (int)status));

		}

		break;



	case BRCMF_E_BEACON_RX:

		if (status == BRCMF_E_STATUS_SUCCESS) {

		if (status == BRCMF_E_STATUS_SUCCESS)

			BRCMF_EVENT(("MACEVENT: %s, SUCCESS\n", event_name));

		} else if (status == BRCMF_E_STATUS_FAIL) {

		else if (status == BRCMF_E_STATUS_FAIL)

			BRCMF_EVENT(("MACEVENT: %s, FAIL\n", event_name));

		} else {

		else

			BRCMF_EVENT(("MACEVENT: %s, status %d\n", event_name,

				     status));

		}

		break;



	case BRCMF_E_LINK:
@@ -1112,11 +1108,10 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr) 
	if (drvr->country_code[0] != 0) {

		if (brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_SET_COUNTRY,

					      drvr->country_code,

				     sizeof(drvr->country_code)) < 0) {

					      sizeof(drvr->country_code)) < 0)

			BRCMF_ERROR(("%s: country code setting failed\n",

				     __func__));

	}

	}



	/* query for 'ver' to get version info from firmware */

	memset(buf, 0, sizeof(buf));

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+5 −8
Original line number Diff line number Diff line
@@ -412,12 +412,11 @@ static int _brcmf_set_mac_address(struct brcmf_info *drvr_priv, int ifidx, u8 *a 
	ioc.set = true;



	ret = brcmf_proto_ioctl(&drvr_priv->pub, ifidx, &ioc, ioc.buf, ioc.len);

	if (ret < 0) {

	if (ret < 0)

		BRCMF_ERROR(("%s: set cur_etheraddr failed\n",

			     brcmf_ifname(&drvr_priv->pub, ifidx)));

	} else {

	else

		memcpy(drvr_priv->iflist[ifidx]->net->dev_addr, addr, ETH_ALEN);

	}



	return ret;

}
@@ -771,9 +770,9 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb, 
		drvr->dstats.rx_bytes += skb->len;

		drvr->rx_packets++;	/* Local count */



		if (in_interrupt()) {

		if (in_interrupt())

			netif_rx(skb);

		} else {

		else

			/* If the receive is not processed inside an ISR,

			 * the softirqd must be woken explicitly to service

			 * the NET_RX_SOFTIRQ.  In 2.6 kernels, this is handled
@@ -783,7 +782,6 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb, 
			netif_rx_ni(skb);

	}

}

}



void brcmf_txcomplete(struct brcmf_pub *drvr, struct sk_buff *txp, bool success)

{
@@ -816,10 +814,9 @@ static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *net) 


	ifp = drvr_priv->iflist[ifidx];



	if (drvr_priv->pub.up) {

	if (drvr_priv->pub.up)

		/* Use the protocol to get dongle stats */

		brcmf_proto_dstats(&drvr_priv->pub);

	}



	/* Copy dongle stats to net device stats */

	ifp->stats.rx_packets = drvr_priv->pub.dstats.rx_packets;

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+27 −37
Original line number Diff line number Diff line
@@ -1127,11 +1127,10 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok) 


#if defined(BCMDBG)

		if (bus->alp_only != true) {

			if (SBSDIO_ALPONLY(clkctl)) {

			if (SBSDIO_ALPONLY(clkctl))

				BRCMF_ERROR(("%s: HT Clock should be on.\n",

					     __func__));

		}

		}

#endif				/* defined (BCMDBG) */



		bus->activity = true;
@@ -1428,9 +1427,8 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt, uint c 
	}



	/* Some controllers have trouble with odd bytes -- round to even */

	if (forcealign && (len & (ALIGNMENT - 1))) {

	if (forcealign && (len & (ALIGNMENT - 1)))

			len = roundup(len, ALIGNMENT);

	}



	do {

		ret = brcmf_sdbrcm_send_buf(bus, brcmf_sdcard_cur_sbwad(card),
@@ -1782,10 +1780,10 @@ brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen) 
				}



			}

			if (ret == 0) {

			if (ret == 0)

				bus->tx_seq =

				    (bus->tx_seq + 1) % SDPCM_SEQUENCE_WRAP;

			}



		} while ((ret < 0) && retries++ < TXRETRIES);

	}
@@ -2181,10 +2179,9 @@ brcmf_sdbrcm_membytes(struct brcmf_bus *bus, bool write, u32 address, u8 *data, 
xfer_done:

	/* Return the window to backplane enumeration space for core access */

	if (brcmf_sdbrcm_set_siaddr_window(bus,

					   brcmf_sdcard_cur_sbwad(bus->card))) {

					   brcmf_sdcard_cur_sbwad(bus->card)))

		BRCMF_ERROR(("%s: FAILED to set window back to 0x%x\n",

			     __func__, brcmf_sdcard_cur_sbwad(bus->card)));

	}



	return bcmerror;

}
@@ -2287,13 +2284,12 @@ static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size) 
		    "msgtrace address : 0x%08X\nconsole address  : 0x%08X\n",

		    sdpcm_shared.msgtrace_addr, sdpcm_shared.console_addr);



	if ((sdpcm_shared.flags & SDPCM_SHARED_ASSERT_BUILT) == 0) {

	if ((sdpcm_shared.flags & SDPCM_SHARED_ASSERT_BUILT) == 0)

		/* NOTE: Misspelled assert is intentional - DO NOT FIX.

		 * (Avoids conflict with real asserts for programmatic

		 * parsing of output.)

		 */

		brcmu_bprintf(&strbuf, "Assrt not built in dongle\n");

	}



	if ((sdpcm_shared.flags & (SDPCM_SHARED_ASSERT | SDPCM_SHARED_TRAP)) ==

	    0) {
@@ -2358,10 +2354,10 @@ static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size) 
		BRCMF_ERROR(("%s: %s\n", __func__, strbuf.origbuf));



#ifdef BCMDBG

	if (sdpcm_shared.flags & SDPCM_SHARED_TRAP) {

	if (sdpcm_shared.flags & SDPCM_SHARED_TRAP)

		/* Mem dump to a file on device */

		brcmf_sdbrcm_mem_dump(bus);

	}



#endif				/* BCMDBG */



done:
@@ -2591,12 +2587,11 @@ brcmf_sdbrcm_doiovar(struct brcmf_bus *bus, const struct brcmu_iovar *vi, u32 ac 
		if (bus->drvr->up) {

			BRCMF_INTR(("%s: %s SDIO interrupts\n", __func__,

				    bus->intr ? "enable" : "disable"));

			if (bus->intr) {

			if (bus->intr)

				brcmf_sdcard_intr_enable(bus->card);

			} else {

			else

				brcmf_sdcard_intr_disable(bus->card);

		}

		}

		break;



	case IOV_GVAL(IOV_POLLRATE):
@@ -3016,10 +3011,10 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus) 
				     varsize, varaddr));

		}

		/* Compare the org NVRAM with the one read from RAM */

		if (memcmp(vbuffer, nvram_ularray, varsize)) {

		if (memcmp(vbuffer, nvram_ularray, varsize))

			BRCMF_ERROR(("%s: Downloaded NVRAM image is "

				     "corrupted.\n", __func__));

		} else

		else

			BRCMF_ERROR(("%s: Download/Upload/Compare of"

				     " NVRAM ok.\n", __func__));
@@ -3249,10 +3244,9 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex) 
				       SBSDIO_FUNC1_CHIPCLKCSR,

				       (saveclk | SBSDIO_FORCE_HT), &err);

	}

	if (err) {

	if (err)

		BRCMF_ERROR(("%s: Failed to force clock for F2: err %d\n",

			     __func__, err));

	}



	/* Turn off the bus (F2), free any pending packets */

	BRCMF_INTR(("%s: disable SDIO interrupts\n", __func__));
@@ -3456,13 +3450,12 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx) 
		lastrbc = (hi << 8) + lo;

	}



	if (!retries) {

	if (!retries)

		BRCMF_ERROR(("%s: count never zeroed: last 0x%04x\n",

			     __func__, lastrbc));

	} else {

	else

		BRCMF_INFO(("%s: flush took %d iterations\n", __func__,

			    (0xffff - retries)));

	}



	if (rtx) {

		bus->rxrtx++;
@@ -3936,11 +3929,11 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) 


			if (pfirst->len == 0) {

				brcmu_pkt_buf_free_skb(pfirst);

				if (plast) {

				if (plast)

					plast->next = pnext;

				} else {

				else

					save_pfirst = pnext;

				}



				continue;

			} else if (brcmf_proto_hdrpull(bus->drvr, &ifidx, pfirst)

					!= 0) {
@@ -3948,11 +3941,11 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq) 
					     __func__));

				bus->drvr->rx_errors++;

				brcmu_pkt_buf_free_skb(pfirst);

				if (plast) {

				if (plast)

					plast->next = pnext;

				} else {

				else

					save_pfirst = pnext;

				}



				continue;

			}
@@ -4647,10 +4640,9 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus) 
			 HMB_DATA_NAKHANDLED |

			 HMB_DATA_FC |

			 HMB_DATA_FWREADY |

			 HMB_DATA_FCDATA_MASK | HMB_DATA_VERSION_MASK)) {

			 HMB_DATA_FCDATA_MASK | HMB_DATA_VERSION_MASK))

		BRCMF_ERROR(("Unknown mailbox data content: 0x%02x\n",

			     hmb_data));

	}



	return intstatus;

}
@@ -5773,13 +5765,13 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus, void *card) 
		 default to use if supported */

	if (brcmf_sdcard_iovar_op(card, "sd_rxchain", NULL, 0,

			    &bus->sd_rxchain, sizeof(s32),

			    false) != 0) {

			    false) != 0)

		bus->sd_rxchain = false;

	} else {

	else

		BRCMF_INFO(("%s: bus module (through sdiocard API) %s"

			    " chaining\n", __func__, bus->sd_rxchain

			    ? "supports" : "does not support"));

	}



	bus->use_rxchain = (bool) bus->sd_rxchain;



	return true;
@@ -5864,9 +5856,8 @@ static void brcmf_sdbrcm_disconnect(void *ptr) 


	BRCMF_TRACE(("%s: Enter\n", __func__));



	if (bus) {

	if (bus)

		brcmf_sdbrcm_release(bus);

	}



	BRCMF_TRACE(("%s: Disconnected\n", __func__));

}
@@ -6085,10 +6076,9 @@ static int _brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus) 
	}



	/* External nvram takes precedence if specified */

	if (brcmf_sdbrcm_download_nvram(bus)) {

	if (brcmf_sdbrcm_download_nvram(bus))

		BRCMF_ERROR(("%s: dongle nvram file download failed\n",

			     __func__));

	}



	/* Take arm out of reset */

	if (brcmf_sdbrcm_download_state(bus, false)) {

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+13 −13
Original line number Diff line number Diff line
@@ -677,12 +677,12 @@ brcmf_run_iscan(struct brcmf_cfg80211_iscan_ctrl *iscan, 
	err = brcmf_dev_iovar_setbuf(iscan->dev, "iscan", params, params_size,

				iscan->ioctl_buf, BRCMF_C_IOCTL_SMLEN);

	if (unlikely(err)) {

		if (err == -EBUSY) {

		if (err == -EBUSY)

			WL_INFO("system busy : iscan canceled\n");

		} else {

		else

			WL_ERR("error (%d)\n", err);

	}

	}



	kfree(params);

	return err;

}
@@ -790,12 +790,12 @@ __brcmf_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, 
		err = brcmf_dev_ioctl(ndev, BRCMF_C_SCAN, &sr->ssid,

				sizeof(sr->ssid));

		if (err) {

			if (err == -EBUSY) {

			if (err == -EBUSY)

				WL_INFO("system busy : scan for \"%s\" canceled\n",

					sr->ssid.SSID);

			} else {

			else

				WL_ERR("WLC_SCAN error (%d)\n", err);

			}



			brcmf_set_mpc(ndev, 1);

			goto scan_out;

		}
@@ -1049,6 +1049,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, 
	} else {

		memcpy(join_params.params.bssid, ether_bcast, ETH_ALEN);

	}



	brcmf_update_prof(cfg_priv, NULL,

			  &join_params.params.bssid, WL_PROF_BSSID);
@@ -1430,10 +1431,9 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 


	memcpy(join_params.params.bssid, ether_bcast, ETH_ALEN);



	if (join_params.ssid.SSID_len < IEEE80211_MAX_SSID_LEN) {

	if (join_params.ssid.SSID_len < IEEE80211_MAX_SSID_LEN)

		WL_CONN("ssid \"%s\", len (%d)\n",

		       join_params.ssid.SSID, join_params.ssid.SSID_len);

	}



	brcmf_ch_to_chanspec(cfg_priv->channel,

			     &join_params, &join_params_size);
@@ -1946,9 +1946,9 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, 
		scb_val.val = 0;

		err = brcmf_dev_ioctl(dev, BRCMF_C_GET_RSSI, &scb_val,

				sizeof(struct brcmf_scb_val));

		if (unlikely(err)) {

		if (unlikely(err))

			WL_ERR("Could not get rssi (%d)\n", err);

		}



		rssi = le32_to_cpu(scb_val.val);

		sinfo->filled |= STATION_INFO_SIGNAL;

		sinfo->signal = rssi;
@@ -3523,13 +3523,13 @@ static s32 brcmf_event_handler(void *data) 
			BUG();

		}

		WL_INFO("event type (%d)\n", e->etype);

		if (cfg_priv->el.handler[e->etype]) {

		if (cfg_priv->el.handler[e->etype])

			cfg_priv->el.handler[e->etype](cfg_priv,

						       cfg_to_ndev(cfg_priv),

						       &e->emsg, e->edata);

		} else {

		else

			WL_INFO("Unknown Event (%d): ignoring\n", e->etype);

		}



		brcmf_put_event(e);

	}

	WL_INFO("was terminated\n");