Skip to content

Commit

Permalink
staging: brcm80211: remove checkpatch errors found in fullmac
Browse files Browse the repository at this point in the history
A checkpatch run was done over the complete source files to determine
how much coding style issues there are in the driver. This patch fixes
the checkpatch errors in fullmac driver brcmfmac listed below.

ERROR: do not initialise globals to 0 or NULL
+uint dhd_poll = false;
--
ERROR: do not use assignment in if condition
+       if (!ifp && !(ifp = kmalloc(sizeof(dhd_if_t), GFP_ATOMIC))) {
--
ERROR: do not use assignment in if condition
+       if (unlikely(!(wl_cfg80211_dev &&                               \
--
ERROR: do not initialise statics to 0 or NULL
+       static bool iscan_pass_abort = false;
--

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent 1c4c54b commit a7c551b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
11 changes: 7 additions & 4 deletions drivers/staging/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ int dhd_idletime = DHD_IDLETIME_TICKS;
module_param(dhd_idletime, int, 0);

/* Use polling */
uint dhd_poll = false;
uint dhd_poll;
module_param(dhd_poll, uint, 0);

/* Use cfg80211 */
Expand Down Expand Up @@ -1817,9 +1817,12 @@ dhd_add_if(dhd_info_t *dhd, int ifidx, void *handle, char *name,
ASSERT(dhd && (ifidx < DHD_MAX_IFS));

ifp = dhd->iflist[ifidx];
if (!ifp && !(ifp = kmalloc(sizeof(dhd_if_t), GFP_ATOMIC))) {
DHD_ERROR(("%s: OOM - dhd_if_t\n", __func__));
return -ENOMEM;
if (!ifp) {
ifp = kmalloc(sizeof(dhd_if_t), GFP_ATOMIC);
if (!ifp) {
DHD_ERROR(("%s: OOM - dhd_if_t\n", __func__));
return -ENOMEM;
}
}

memset(ifp, 0, sizeof(dhd_if_t));
Expand Down
11 changes: 7 additions & 4 deletions drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,8 @@ static void wl_debugfs_remove_netdev(struct wl_priv *wl);

#define WL_PRIV_GET() \
({ \
struct wl_iface *ci; \
if (unlikely(!(wl_cfg80211_dev && \
(ci = wl_get_drvdata(wl_cfg80211_dev))))) { \
struct wl_iface *ci = wl_get_drvdata(wl_cfg80211_dev); \
if (unlikely(!ci)) { \
WL_ERR("wl_cfg80211_dev is unavailable\n"); \
BUG(); \
} \
Expand Down Expand Up @@ -4298,7 +4297,11 @@ static void wl_set_drvdata(struct wl_dev *dev, void *data)

static void *wl_get_drvdata(struct wl_dev *dev)
{
return dev->driver_data;
void *data = NULL;

if (dev)
data = dev->driver_data;
return data;
}

s32 wl_cfg80211_read_fw(s8 *buf, u32 size)
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/brcmfmac/wl_iw.c
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@ static int _iscan_sysioc_thread(void *data)
{
u32 status;
iscan_info_t *iscan = (iscan_info_t *) data;
static bool iscan_pass_abort = false;
static bool iscan_pass_abort;

allow_signal(SIGTERM);
status = WL_SCAN_RESULTS_PARTIAL;
Expand Down

0 comments on commit a7c551b

Please sign in to comment.