2010-01-14 12:21:42

by Rafał Miłecki

[permalink] [raw]
Subject: [PATCH 2/2] b43: N-PHY: follow kernel coding style for struct declaration


Signed-off-by: Rafał Miłecki <[email protected]>
---
drivers/net/wireless/b43/phy_common.c | 14 ++++++++++++++
drivers/net/wireless/b43/phy_common.h | 1 +
drivers/net/wireless/b43/phy_lp.c | 17 ++---------------
3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c
index 75b26e1..1389ab2 100644
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -421,3 +421,17 @@ void b43_phyop_switch_analog_generic(struct b43_wldev *dev, bool on)
{
b43_write16(dev, B43_MMIO_PHY0, on ? 0 : 0xF4);
}
+
+/* Find the position of the most significant bit */
+u8 phy_nbits(s32 val)
+{
+ u32 tmp = abs(val);
+ u8 nbits = 0;
+
+ while (tmp != 0) {
+ nbits++;
+ tmp >>= 1;
+ }
+
+ return nbits;
+}
diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h
index 9edd4e8..332ba4c 100644
--- a/drivers/net/wireless/b43/phy_common.h
+++ b/drivers/net/wireless/b43/phy_common.h
@@ -418,5 +418,6 @@ int b43_phy_shm_tssi_read(struct b43_wldev *dev, u16 shm_offset);
*/
void b43_phyop_switch_analog_generic(struct b43_wldev *dev, bool on);

+u8 phy_nbits(s32 val);

#endif /* LINUX_B43_PHY_COMMON_H_ */
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index c4e9c5c..7ad9215 100644
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
@@ -1593,19 +1593,6 @@ static const struct lpphy_rx_iq_comp lpphy_rev2plus_iq_comp = {
.c0 = 0,
};

-static u8 lpphy_nbits(s32 val)
-{
- u32 tmp = abs(val);
- u8 nbits = 0;
-
- while (tmp != 0) {
- nbits++;
- tmp >>= 1;
- }
-
- return nbits;
-}
-
static int lpphy_calc_rx_iq_comp(struct b43_wldev *dev, u16 samples)
{
struct lpphy_iq_est iq_est;
@@ -1632,8 +1619,8 @@ static int lpphy_calc_rx_iq_comp(struct b43_wldev *dev, u16 samples)
goto out;
}

- prod_msb = lpphy_nbits(prod);
- q_msb = lpphy_nbits(qpwr);
+ prod_msb = phy_nbits(prod);
+ q_msb = phy_nbits(qpwr);
tmp1 = prod_msb - 20;

if (tmp1 >= 0) {
--
1.6.4.2



2010-01-14 15:42:02

by Stanislaw Gruszka

[permalink] [raw]
Subject: Re: [PATCH 2/2] b43: N-PHY: follow kernel coding style for struct declaration

Hi

On Thu, Jan 14, 2010 at 01:21:35PM +0100, Rafał Miłecki wrote:
>
> Signed-off-by: Rafał Miłecki <[email protected]>
> ---
> drivers/net/wireless/b43/phy_common.c | 14 ++++++++++++++
> drivers/net/wireless/b43/phy_common.h | 1 +
> drivers/net/wireless/b43/phy_lp.c | 17 ++---------------
> 3 files changed, 17 insertions(+), 15 deletions(-)

Your second patch is the same as first one.

Stanislaw

2010-01-14 15:49:53

by Pat Erley

[permalink] [raw]
Subject: Re: [PATCH 2/2] b43: N-PHY: follow kernel coding style for struct declaration

On Thu, 14 Jan 2010 13:21:35 +0100, Rafał Miłecki <[email protected]>
wrote:
> Signed-off-by: Rafał Miłecki <[email protected]>
> ---
> drivers/net/wireless/b43/phy_common.c | 14 ++++++++++++++
> drivers/net/wireless/b43/phy_common.h | 1 +
> drivers/net/wireless/b43/phy_lp.c | 17 ++---------------
> 3 files changed, 17 insertions(+), 15 deletions(-)
>
<snip>

Wrong patch attached? I got the MSB patch again on this one.

2010-01-14 15:47:09

by Rafał Miłecki

[permalink] [raw]
Subject: Re: [PATCH 2/2] b43: N-PHY: follow kernel coding style for struct declaration

W dniu 14 stycznia 2010 16:39 użytkownik Stanislaw Gruszka
<[email protected]> napisał:
> Hi
>
> On Thu, Jan 14, 2010 at 01:21:35PM +0100, Rafał Miłecki wrote:
>>
>> Signed-off-by: Rafał Miłecki <[email protected]>
>> ---
>>  drivers/net/wireless/b43/phy_common.c |   14 ++++++++++++++
>>  drivers/net/wireless/b43/phy_common.h |    1 +
>>  drivers/net/wireless/b43/phy_lp.c     |   17 ++---------------
>>  3 files changed, 17 insertions(+), 15 deletions(-)
>
> Your second patch is the same as first one.

Whoops, thanks :)

--
Rafał