Re: [PATCH] b43: use bcma_pmu_spuravoid_pllupdate()

[Hauke Mehrtens <hauke@hauke-m.de>]

On 03/23/2013 03:46 PM, Hauke Mehrtens wrote:
> On 03/21/2013 11:41 PM, Julian Calaby wrote:
>> Hi Hauke,
>>
>> On Fri, Mar 22, 2013 at 4:11 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>>> Do not implement this in b43, but use bcma_pmu_spuravoid_pllupdate().
>>>
>>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>>> ---
>>>  drivers/net/wireless/b43/phy_n.c |   92 ++++++++------------------------------
>>>  1 file changed, 18 insertions(+), 74 deletions(-)
>>>
>>> diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
>>> index 3c35382..4130c04 100644
>>> --- a/drivers/net/wireless/b43/phy_n.c
>>> +++ b/drivers/net/wireless/b43/phy_n.c
>>> @@ -5220,19 +5150,33 @@ static void b43_nphy_channel_setup(struct b43_wldev *dev,
>>>
>>>         if (dev->phy.rev >= 3 &&
>>>             dev->phy.n->spur_avoid != B43_SPUR_AVOID_DISABLE) {
>>> -               bool avoid = false;
>>> +               struct bcma_drv_cc __maybe_unused *cc;
>>
>> Could this go inside the #ifdef in the switch statement - that way the
>> __maybe_unused should be unnecessary?
> 
> No that is not possible, C forbids it there:
> 
> drivers/net/wireless/b43/phy_n.c: In function ‘b43_nphy_channel_setup’:
> drivers/net/wireless/b43/phy_n.c:5169:4: error: a label can only be part
> of a statement and a declaration is not a statement
> 
>>
>>> +               int avoid = 0;
>>
>> I though that bools were converted to ints exactly as you've converted
>> the avoid variable here.
> 
> Yes I will change that.
> 
I thought about this and I would like to stay with int, because the
functions wants an int and bcma_pmu_spuravoid_pllupdate() also handles
avoid == 2.

Hauke