From: "Rafał Miłecki" <zajec5@gmail.com>
To: linux-wireless@vger.kernel.org,
"John W. Linville" <linville@tuxdriver.com>
Cc: b43-dev@lists.infradead.org, "Rafał Miłecki" <zajec5@gmail.com>
Subject: [PATCH 1/9] b43: rename ssb_device variable in ssb specific functions
Date: Wed, 18 May 2011 02:06:35 +0200 [thread overview]
Message-ID: <1305677203-16660-1-git-send-email-zajec5@gmail.com> (raw)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
drivers/net/wireless/b43/main.c | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index eb41596..1e81a0d 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4982,26 +4982,27 @@ static struct b43_wl *b43_wireless_init(struct ssb_device *dev)
return wl;
}
-static int b43_ssb_probe(struct ssb_device *dev, const struct ssb_device_id *id)
+static
+int b43_ssb_probe(struct ssb_device *sdev, const struct ssb_device_id *id)
{
struct b43_wl *wl;
int err;
int first = 0;
- wl = ssb_get_devtypedata(dev);
+ wl = ssb_get_devtypedata(sdev);
if (!wl) {
/* Probing the first core. Must setup common struct b43_wl */
first = 1;
- b43_sprom_fixup(dev->bus);
- wl = b43_wireless_init(dev);
+ b43_sprom_fixup(sdev->bus);
+ wl = b43_wireless_init(sdev);
if (IS_ERR(wl)) {
err = PTR_ERR(wl);
goto out;
}
- ssb_set_devtypedata(dev, wl);
- B43_WARN_ON(ssb_get_devtypedata(dev) != wl);
+ ssb_set_devtypedata(sdev, wl);
+ B43_WARN_ON(ssb_get_devtypedata(sdev) != wl);
}
- err = b43_one_core_attach(dev, wl);
+ err = b43_one_core_attach(sdev, wl);
if (err)
goto err_wireless_exit;
@@ -5016,17 +5017,17 @@ static int b43_ssb_probe(struct ssb_device *dev, const struct ssb_device_id *id)
return err;
err_one_core_detach:
- b43_one_core_detach(dev);
+ b43_one_core_detach(sdev);
err_wireless_exit:
if (first)
- b43_wireless_exit(dev, wl);
+ b43_wireless_exit(sdev, wl);
return err;
}
-static void b43_ssb_remove(struct ssb_device *dev)
+static void b43_ssb_remove(struct ssb_device *sdev)
{
- struct b43_wl *wl = ssb_get_devtypedata(dev);
- struct b43_wldev *wldev = ssb_get_drvdata(dev);
+ struct b43_wl *wl = ssb_get_devtypedata(sdev);
+ struct b43_wldev *wldev = ssb_get_drvdata(sdev);
/* We must cancel any work here before unregistering from ieee80211,
* as the ieee80211 unreg will destroy the workqueue. */
@@ -5042,14 +5043,14 @@ static void b43_ssb_remove(struct ssb_device *dev)
ieee80211_unregister_hw(wl->hw);
}
- b43_one_core_detach(dev);
+ b43_one_core_detach(sdev);
if (list_empty(&wl->devlist)) {
b43_leds_unregister(wl);
/* Last core on the chip unregistered.
* We can destroy common struct b43_wl.
*/
- b43_wireless_exit(dev, wl);
+ b43_wireless_exit(sdev, wl);
}
}
--
1.7.3.4
next reply other threads:[~2011-05-17 23:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-18 0:06 Rafał Miłecki [this message]
2011-05-18 0:06 ` [PATCH 2/9] b43: add bus device abstraction layer Rafał Miłecki
2011-05-18 0:28 ` Julian Calaby
2011-05-18 7:01 ` Rafał Miłecki
2011-05-18 7:21 ` Julian Calaby
2011-05-18 7:49 ` Rafał Miłecki
2011-05-18 12:26 ` Julian Calaby
2011-05-18 0:06 ` [PATCH 3/9] b43: bus: abstract R/W operations Rafał Miłecki
2011-05-18 0:06 ` [PATCH 4/9] b43: bus: abstract 80211 core info Rafał Miłecki
2011-05-18 0:06 ` [PATCH 5/9] b43: bus: abstract SPROM Rafał Miłecki
2011-05-18 0:06 ` [PATCH 6/9] b43: bus: abstract device structs and irq Rafał Miłecki
2011-05-18 0:06 ` [PATCH 7/9] b43: bus: abstract chip info Rafał Miłecki
2011-05-18 0:06 ` [PATCH 8/9] b43: bus: abstract board info Rafał Miłecki
2011-05-18 0:06 ` [PATCH 9/9] b43: bus: abstract bus and core operations Rafał Miłecki
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=1305677203-16660-1-git-send-email-zajec5@gmail.com \
--to=zajec5@gmail.com \
--cc=b43-dev@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).