W dniu 17 listopada 2010 21:17 uÅytkownik Michael BÃsch <mb@xxxxxxxxx> napisaÅ:
> On Wed, 2010-11-17 at 20:56 +0100, RafaÅ MiÅecki wrote:
>> Devices which use LO enabled bit are covered by b43legacy
>>
>> Signed-off-by: RafaÅ MiÅecki <zajec5@xxxxxxxxx>
>> ---
>> Is this alright to use inline for this? Is my WARN_ON OK?
>> ---
>> Âdrivers/net/wireless/b43/main.c  |  Â2 ++
>> Âdrivers/net/wireless/b43/rfkill.c | Â 21 +++------------------
>> Âdrivers/net/wireless/b43/rfkill.h | Â Â4 ++--
>> Â3 files changed, 7 insertions(+), 20 deletions(-)
>>
>> diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
>> index fa48803..9b71bb1 100644
>> --- a/drivers/net/wireless/b43/main.c
>> +++ b/drivers/net/wireless/b43/main.c
>> @@ -4527,6 +4527,8 @@ static int b43_op_start(struct ieee80211_hw *hw)
>> Â Â Â Â Â Â Â }
>> Â Â Â }
>>
>> + Â Â /* we don't expect older devices which need other RFKILL check */
>> + Â Â B43_WARN_ON(dev->dev->id.revision < 3);
>
> Do we really need that check? The driver is full of assumptions that
> the core revision is >=5.
Thanks for info, wasn't aware of that.
> I also think this assertion is misplaced in the interface start
> handler. If you want it, do it in the rfkill check function. (for
> nondebug build it's a no-op)
>
>> Â Â Â /* XXX: only do if device doesn't support rfkill irq */
>> Â Â Â wiphy_rfkill_start_polling(hw->wiphy);
>>
>> diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
>> index 78016ae..012ed2f 100644
>> --- a/drivers/net/wireless/b43/rfkill.c
>> +++ b/drivers/net/wireless/b43/rfkill.c
>> @@ -26,25 +26,10 @@
>>
>>
>> Â/* Returns TRUE, if the radio is enabled in hardware. */
>> -bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
>> +inline bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
>
> inline doesn't make sense here.
Err, tip for compiler for optimization? To avoid some JUMPs in generated ASM?
>> {
>> - Â Â if (dev->phy.rev >= 3 || dev->phy.type == B43_PHYTYPE_LP) {
>> - Â Â Â Â Â Â if (!(b43_read32(dev, B43_MMIO_RADIO_HWENABLED_HI)
>> - Â Â Â Â Â Â Â Â Â & B43_MMIO_RADIO_HWENABLED_HI_MASK))
>> - Â Â Â Â Â Â Â Â Â Â return 1;
>> - Â Â } else {
>> - Â Â Â Â Â Â /* To prevent CPU fault on PPC, do not read a register
>> - Â Â Â Â Â Â Â* unless the interface is started; however, on resume
>> - Â Â Â Â Â Â Â* for hibernation, this routine is entered early. When
>> - Â Â Â Â Â Â Â* that happens, unconditionally return TRUE.
>> - Â Â Â Â Â Â Â*/
>> - Â Â Â Â Â Â if (b43_status(dev) < B43_STAT_STARTED)
>> - Â Â Â Â Â Â Â Â Â Â return 1;
>> - Â Â Â Â Â Â if (b43_read16(dev, B43_MMIO_RADIO_HWENABLED_LO)
>> - Â Â Â Â Â Â Â Â & B43_MMIO_RADIO_HWENABLED_LO_MASK)
>> - Â Â Â Â Â Â Â Â Â Â return 1;
>> - Â Â }
>> - Â Â return 0;
>> + Â Â return !(b43_read32(dev, B43_MMIO_RADIO_HWENABLED_HI)
>> + Â Â Â Â Â Â & B43_MMIO_RADIO_HWENABLED_HI_MASK);
>> Â}
>
> Getting rid of that old crap is a good idea. So ACK on this part.
>
>> /* The poll callback for the hardware button. */
>> diff --git a/drivers/net/wireless/b43/rfkill.h b/drivers/net/wireless/b43/rfkill.h
>> index f046c3c..7aa8a5a 100644
>> --- a/drivers/net/wireless/b43/rfkill.h
>> +++ b/drivers/net/wireless/b43/rfkill.h
>> @@ -4,8 +4,8 @@
>> Âstruct ieee80211_hw;
>> Âstruct b43_wldev;
>>
>> -void b43_rfkill_poll(struct ieee80211_hw *hw);
>> +inline bool b43_is_hw_radio_enabled(struct b43_wldev *dev);
>>
>> -bool b43_is_hw_radio_enabled(struct b43_wldev *dev);
>> +void b43_rfkill_poll(struct ieee80211_hw *hw);
>>
>> Â#endif /* B43_RFKILL_H_ */
>
> doesn't make sense.
"inline" was added to match rfkill.c change. Order was changed to
match rfkill.c order, but I guess we can live without that.
--
RafaÅ
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
