b43: bus: add helpers for getting/setting wldev from/in bus core
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
42c9a45896
commit
74abacb6b5
|
@ -225,3 +225,32 @@ struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev)
|
||||||
return dev;
|
return dev;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_B43_SSB */
|
#endif /* CONFIG_B43_SSB */
|
||||||
|
|
||||||
|
void *b43_bus_get_wldev(struct b43_bus_dev *dev)
|
||||||
|
{
|
||||||
|
switch (dev->bus_type) {
|
||||||
|
#ifdef CONFIG_B43_BCMA
|
||||||
|
case B43_BUS_BCMA:
|
||||||
|
return bcma_get_drvdata(dev->bdev);
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_B43_SSB
|
||||||
|
case B43_BUS_SSB:
|
||||||
|
return ssb_get_drvdata(dev->sdev);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
void b43_bus_set_wldev(struct b43_bus_dev *dev, void *wldev)
|
||||||
|
{
|
||||||
|
switch (dev->bus_type) {
|
||||||
|
#ifdef CONFIG_B43_BCMA
|
||||||
|
case B43_BUS_BCMA:
|
||||||
|
bcma_set_drvdata(dev->bdev, wldev);
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_B43_SSB
|
||||||
|
case B43_BUS_SSB:
|
||||||
|
ssb_set_drvdata(dev->sdev, wldev);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -64,4 +64,7 @@ static inline bool b43_bus_host_is_sdio(struct b43_bus_dev *dev)
|
||||||
struct b43_bus_dev *b43_bus_dev_bcma_init(struct bcma_device *core);
|
struct b43_bus_dev *b43_bus_dev_bcma_init(struct bcma_device *core);
|
||||||
struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev);
|
struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev);
|
||||||
|
|
||||||
|
void *b43_bus_get_wldev(struct b43_bus_dev *dev);
|
||||||
|
void b43_bus_set_wldev(struct b43_bus_dev *dev, void *data);
|
||||||
|
|
||||||
#endif /* B43_BUS_H_ */
|
#endif /* B43_BUS_H_ */
|
||||||
|
|
|
@ -5000,13 +5000,13 @@ static void b43_one_core_detach(struct b43_bus_dev *dev)
|
||||||
/* Do not cancel ieee80211-workqueue based work here.
|
/* Do not cancel ieee80211-workqueue based work here.
|
||||||
* See comment in b43_remove(). */
|
* See comment in b43_remove(). */
|
||||||
|
|
||||||
wldev = ssb_get_drvdata(dev->sdev);
|
wldev = b43_bus_get_wldev(dev);
|
||||||
wl = wldev->wl;
|
wl = wldev->wl;
|
||||||
b43_debugfs_remove_device(wldev);
|
b43_debugfs_remove_device(wldev);
|
||||||
b43_wireless_core_detach(wldev);
|
b43_wireless_core_detach(wldev);
|
||||||
list_del(&wldev->list);
|
list_del(&wldev->list);
|
||||||
wl->nr_devs--;
|
wl->nr_devs--;
|
||||||
ssb_set_drvdata(dev->sdev, NULL);
|
b43_bus_set_wldev(dev, NULL);
|
||||||
kfree(wldev);
|
kfree(wldev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5032,7 +5032,7 @@ static int b43_one_core_attach(struct b43_bus_dev *dev, struct b43_wl *wl)
|
||||||
|
|
||||||
list_add(&wldev->list, &wl->devlist);
|
list_add(&wldev->list, &wl->devlist);
|
||||||
wl->nr_devs++;
|
wl->nr_devs++;
|
||||||
ssb_set_drvdata(dev->sdev, wldev);
|
b43_bus_set_wldev(dev, wldev);
|
||||||
b43_debugfs_add_device(wldev);
|
b43_debugfs_add_device(wldev);
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
|
Loading…
Reference in New Issue