| Message ID | 1445270543-2209-4-git-send-email-paulmcquad@gmail.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 19 Oct 2015 17:02:23 +0100 Paul McQuade <paulmcquad@gmail.com> wrote: > diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c > index 058a9f2..086f0ba 100644 > --- a/drivers/net/wireless/b43/phy_lp.c > +++ b/drivers/net/wireless/b43/phy_lp.c > @@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev, > { > struct ssb_bus *bus = dev->dev->sdev->bus; > > - static const struct b206x_channel *chandata = NULL; > + static const struct b206x_channel *chandata; > u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000; > u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count; > u16 old_comm15, scale; Why on earth is this static anyway? That seems really wrong here. The static should be removed (and the =NULL init be left in place.)
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 040caa4..2b50650 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -109,7 +109,7 @@ int b43_modparam_verbose = B43_VERBOSITY_DEFAULT; module_param_named(verbose, b43_modparam_verbose, int, 0644); MODULE_PARM_DESC(verbose, "Log message verbosity: 0=error, 1=warn, 2=info(default), 3=debug"); -static int b43_modparam_pio = 0; +static int b43_modparam_pio; module_param_named(pio, b43_modparam_pio, int, 0644); MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO"); diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c index 058a9f2..086f0ba 100644 --- a/drivers/net/wireless/b43/phy_lp.c +++ b/drivers/net/wireless/b43/phy_lp.c @@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev, { struct ssb_bus *bus = dev->dev->sdev->bus; - static const struct b206x_channel *chandata = NULL; + static const struct b206x_channel *chandata; u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000; u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count; u16 old_comm15, scale;
No Need to state Statics are a 0 or NULL Signed-off-by: Paul McQuade <paulmcquad@gmail.com> --- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/b43/phy_lp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)