* [PATCH] b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set
@ 2011-12-14 14:08 John W. Linville
2011-12-15 6:03 ` Rafał Miłecki
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: John W. Linville @ 2011-12-14 14:08 UTC (permalink / raw)
To: linux-wireless; +Cc: zajec5, John W. Linville
Avoids this:
ERROR: "bcma_chipco_pll_write" [drivers/net/wireless/b43/b43.ko] undefined!
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
It looks like phy_lcn.c could use some bits like this as well...
drivers/net/wireless/b43/phy_n.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 6b95fd2..154f97d 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -4048,6 +4048,7 @@ int b43_phy_initn(struct b43_wldev *dev)
/* http://bcm-v4.sipsolutions.net/802.11/PmuSpurAvoid */
static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid)
{
+#ifdef CONFIG_B43_BCMA
struct bcma_drv_cc *cc = &dev->dev->bdev->bus->drv_cc;
u32 pmu_ctl;
if (dev->dev->chip_id == 43224 || dev->dev->chip_id == 43225) {
@@ -4098,6 +4099,9 @@ static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid)
return;
}
bcma_cc_set32(cc, BCMA_CC_PMU_CTL, pmu_ctl);
+#else
+ return;
+#endif
}
/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ChanspecSetup */
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set
2011-12-14 14:08 [PATCH] b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set John W. Linville
@ 2011-12-15 6:03 ` Rafał Miłecki
2011-12-15 6:06 ` Rafał Miłecki
2011-12-15 11:45 ` Rafał Miłecki
2 siblings, 0 replies; 6+ messages in thread
From: Rafał Miłecki @ 2011-12-15 6:03 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless
2011/12/14 John W. Linville <linville@tuxdriver.com>:
> Avoids this:
>
> ERROR: "bcma_chipco_pll_write" [drivers/net/wireless/b43/b43.ko] undefined!
Ouch, sorry. Thanks for patch.
--
Rafał
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set
2011-12-14 14:08 [PATCH] b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set John W. Linville
2011-12-15 6:03 ` Rafał Miłecki
@ 2011-12-15 6:06 ` Rafał Miłecki
2011-12-15 11:45 ` Rafał Miłecki
2 siblings, 0 replies; 6+ messages in thread
From: Rafał Miłecki @ 2011-12-15 6:06 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless
2011/12/14 John W. Linville <linville@tuxdriver.com>:
> Avoids this:
>
> ERROR: "bcma_chipco_pll_write" [drivers/net/wireless/b43/b43.ko] undefined!
>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
> It looks like phy_lcn.c could use some bits like this as well...
>
> drivers/net/wireless/b43/phy_n.c | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
> index 6b95fd2..154f97d 100644
> --- a/drivers/net/wireless/b43/phy_n.c
> +++ b/drivers/net/wireless/b43/phy_n.c
> @@ -4048,6 +4048,7 @@ int b43_phy_initn(struct b43_wldev *dev)
> /* http://bcm-v4.sipsolutions.net/802.11/PmuSpurAvoid */
> static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid)
> {
> +#ifdef CONFIG_B43_BCMA
> struct bcma_drv_cc *cc = &dev->dev->bdev->bus->drv_cc;
Oops, after a moment it doesn't look good. Nack.
We can't unconditionally touch bdev in phy_n, this code can also be
executed for SSB based card. We need "ifdef" plus
switch (dev->dev->bus_type) {
--
Rafał
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set
2011-12-14 14:08 [PATCH] b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set John W. Linville
2011-12-15 6:03 ` Rafał Miłecki
2011-12-15 6:06 ` Rafał Miłecki
@ 2011-12-15 11:45 ` Rafał Miłecki
2011-12-16 21:33 ` John W. Linville
2 siblings, 1 reply; 6+ messages in thread
From: Rafał Miłecki @ 2011-12-15 11:45 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless
2011/12/14 John W. Linville <linville@tuxdriver.com>:
> Avoids this:
>
> ERROR: "bcma_chipco_pll_write" [drivers/net/wireless/b43/b43.ko] undefined!
>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
[BTW] Can you use b43-dev as CC in the future?
--
Rafał
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set
2011-12-15 11:45 ` Rafał Miłecki
@ 2011-12-16 21:33 ` John W. Linville
2011-12-16 23:32 ` Rafał Miłecki
0 siblings, 1 reply; 6+ messages in thread
From: John W. Linville @ 2011-12-16 21:33 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: linux-wireless
On Thu, Dec 15, 2011 at 12:45:58PM +0100, Rafał Miłecki wrote:
> 2011/12/14 John W. Linville <linville@tuxdriver.com>:
> > Avoids this:
> >
> > ERROR: "bcma_chipco_pll_write" [drivers/net/wireless/b43/b43.ko] undefined!
> >
> > Signed-off-by: John W. Linville <linville@tuxdriver.com>
>
> [BTW] Can you use b43-dev as CC in the future?
Maybe you should update the MAINTAINERS entry so that
scripts/get_maintainer.pl will find that?
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set
2011-12-16 21:33 ` John W. Linville
@ 2011-12-16 23:32 ` Rafał Miłecki
0 siblings, 0 replies; 6+ messages in thread
From: Rafał Miłecki @ 2011-12-16 23:32 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless
W dniu 16 grudnia 2011 22:33 użytkownik John W. Linville
<linville@tuxdriver.com> napisał:
> On Thu, Dec 15, 2011 at 12:45:58PM +0100, Rafał Miłecki wrote:
>> 2011/12/14 John W. Linville <linville@tuxdriver.com>:
>> > Avoids this:
>> >
>> > ERROR: "bcma_chipco_pll_write" [drivers/net/wireless/b43/b43.ko] undefined!
>> >
>> > Signed-off-by: John W. Linville <linville@tuxdriver.com>
>>
>> [BTW] Can you use b43-dev as CC in the future?
>
> Maybe you should update the MAINTAINERS entry so that
> scripts/get_maintainer.pl will find that?
Absolutely! I will, thanks.
--
Rafał
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-12-16 23:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-14 14:08 [PATCH] b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set John W. Linville
2011-12-15 6:03 ` Rafał Miłecki
2011-12-15 6:06 ` Rafał Miłecki
2011-12-15 11:45 ` Rafał Miłecki
2011-12-16 21:33 ` John W. Linville
2011-12-16 23:32 ` Rafał Miłecki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.