Return-path: Received: from mail-qw0-f46.google.com ([209.85.216.46]:53212 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755509Ab0KSQMk convert rfc822-to-8bit (ORCPT ); Fri, 19 Nov 2010 11:12:40 -0500 Received: by qwd6 with SMTP id 6so160073qwd.19 for ; Fri, 19 Nov 2010 08:12:39 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1290028477-6462-1-git-send-email-zajec5@gmail.com> References: <1290028477-6462-1-git-send-email-zajec5@gmail.com> From: =?ISO-8859-1?Q?G=E1bor_Stefanik?= Date: Fri, 19 Nov 2010 17:12:19 +0100 Message-ID: Subject: Re: [PATCH V2] b43: rfkill: use HI enabled bit for all devices To: =?ISO-8859-2?Q?Rafa=B3_Mi=B3ecki?= Cc: linux-wireless@vger.kernel.org, "John W. Linville" , b43-dev@lists.infradead.org Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: 2010/11/17 Rafał Miłecki : > Devices which use LO enabled bit are covered by b43legacy > > Signed-off-by: Rafał Miłecki > --- > V2: Dropped some not needed stuff as pointed by Michael, thanks! > > John: it's .38 ofc. > --- >  drivers/net/wireless/b43/rfkill.c |   19 ++----------------- >  1 files changed, 2 insertions(+), 17 deletions(-) > > diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c > index 78016ae..86bc0a0 100644 > --- a/drivers/net/wireless/b43/rfkill.c > +++ b/drivers/net/wireless/b43/rfkill.c > @@ -28,23 +28,8 @@ >  /* Returns TRUE, if the radio is enabled in hardware. */ >  bool b43_is_hw_radio_enabled(struct b43_wldev *dev) >  { > -       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; Is there any reason why this bool originally returned 1 or 0 instead of true or false? > +       return !(b43_read32(dev, B43_MMIO_RADIO_HWENABLED_HI) > +               & B43_MMIO_RADIO_HWENABLED_HI_MASK); >  } > >  /* The poll callback for the hardware button. */ > -- > 1.6.0.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at  http://vger.kernel.org/majordomo-info.html > -- Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)