From: Michael Buesch <mb@bu3sch.de>
To: Albert Herranz <albert_herranz@yahoo.es>
Cc: bcm43xx-dev@lists.berlios.de, linux-wireless@vger.kernel.org
Subject: Re: [PATCH] b43: fix build error if !CONFIG_B43_LEDS
Date: Wed, 16 Sep 2009 00:24:12 +0200 [thread overview]
Message-ID: <200909160024.15475.mb@bu3sch.de> (raw)
In-Reply-To: <1253046774-14416-1-git-send-email-albert_herranz@yahoo.es>
On Tuesday 15 September 2009 22:32:54 Albert Herranz wrote:
> Fix the following build error when CONFIG_B43_LEDS is not selected:
>
> drivers/net/wireless/b43/main.c: In function 'b43_remove':
> drivers/net/wireless/b43/main.c:4990: error: 'struct b43_leds' has no member named 'stop'
> drivers/net/wireless/b43/main.c:4991: error: 'struct b43_leds' has no member named 'work'
> make[4]: *** [drivers/net/wireless/b43/main.o] Error 1
>
> Signed-off-by: Albert Herranz <albert_herranz@yahoo.es>
> ---
> drivers/net/wireless/b43/leds.c | 8 ++++++++
> drivers/net/wireless/b43/leds.h | 4 ++++
> drivers/net/wireless/b43/main.c | 3 +--
> 3 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c
> index fbe31e0..fbe3d4f 100644
> --- a/drivers/net/wireless/b43/leds.c
> +++ b/drivers/net/wireless/b43/leds.c
> @@ -325,6 +325,14 @@ void b43_leds_exit(struct b43_wldev *dev)
> b43_led_turn_off(dev, leds->led_radio.index, leds->led_radio.activelow);
> }
>
> +void b43_leds_stop(struct b43_wldev *dev)
> +{
> + struct b43_leds *leds = &dev->wl->leds;
> +
> + leds->stop = 1;
> + cancel_work_sync(&leds->work);
> +}
> +
> void b43_leds_register(struct b43_wldev *dev)
> {
> unsigned int i;
> diff --git a/drivers/net/wireless/b43/leds.h b/drivers/net/wireless/b43/leds.h
> index 49d3da5..9592e4c 100644
> --- a/drivers/net/wireless/b43/leds.h
> +++ b/drivers/net/wireless/b43/leds.h
> @@ -63,6 +63,7 @@ void b43_leds_register(struct b43_wldev *dev);
> void b43_leds_unregister(struct b43_wldev *dev);
> void b43_leds_init(struct b43_wldev *dev);
> void b43_leds_exit(struct b43_wldev *dev);
> +void b43_leds_stop(struct b43_wldev *dev);
>
>
> #else /* CONFIG_B43_LEDS */
> @@ -84,6 +85,9 @@ static inline void b43_leds_init(struct b43_wldev *dev)
> static inline void b43_leds_exit(struct b43_wldev *dev)
> {
> }
> +static inline void b43_leds_stop(struct b43_wldev *dev)
> +{
> +}
> #endif /* CONFIG_B43_LEDS */
>
> #endif /* B43_LEDS_H_ */
> diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
> index a8840ef..6c0ea21 100644
> --- a/drivers/net/wireless/b43/main.c
> +++ b/drivers/net/wireless/b43/main.c
> @@ -4987,8 +4987,7 @@ static void b43_remove(struct ssb_device *dev)
> * might have modified it. Restoring is important, so the networking
> * stack can properly free resources. */
> wl->hw->queues = wl->mac80211_initially_registered_queues;
> - wl->leds.stop = 1;
> - cancel_work_sync(&wl->leds.work);
> + b43_leds_stop(wldev);
> ieee80211_unregister_hw(wl->hw);
> }
>
ACK
--
Greetings, Michael.
next prev parent reply other threads:[~2009-09-15 22:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-15 20:32 [PATCH] b43: fix build error if !CONFIG_B43_LEDS Albert Herranz
2009-09-15 22:24 ` Michael Buesch [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-09-15 22:26 Michael Buesch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200909160024.15475.mb@bu3sch.de \
--to=mb@bu3sch.de \
--cc=albert_herranz@yahoo.es \
--cc=bcm43xx-dev@lists.berlios.de \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.