mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-24 23:40:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove struct ath_ahb_softc, it's pointless for supported kernels

Browse Source 
aps_pmstate is not used, so struct ath_ahb_softc is equivalent to struct
ath_softc.
This commit is contained in:
Pavel Roskin 2013-11-13 14:08:08 -05:00
parent 89ca171c1e
commit 75ac97a925
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ath/if_ath_ahb.c
View File

@ -44,14 +44,7 @@
static char *version = RELEASE_VERSION; static char *version = RELEASE_VERSION;
static char *dev_info = "ath_ahb"; static char *dev_info = "ath_ahb";
struct ath_ahb_softc { static struct ath_softc *sclist[2] = {NULL, NULL};
struct ath_softc aps_sc;
#ifdef CONFIG_PM
u32 aps_pmstate[16];
#endif
};
static struct ath_ahb_softc *sclist[2] = {NULL, NULL};
static u_int8_t num_activesc = 0; static u_int8_t num_activesc = 0;
@ -161,18 +154,18 @@ ahb_disable_wmac(u_int16_t devid, u_int16_t wlanNum)
static int static int
exit_ath_wmac(u_int16_t wlanNum, struct ar531x_config *config) exit_ath_wmac(u_int16_t wlanNum, struct ar531x_config *config)
{ {
struct ath_ahb_softc *sc = sclist[wlanNum]; struct ath_softc *sc = sclist[wlanNum];
struct net_device *dev; struct net_device *dev;
u_int16_t devid; u_int16_t devid;
if (sc == NULL) if (sc == NULL)
return -ENODEV; /* XXX: correct return value? */ return -ENODEV; /* XXX: correct return value? */
dev = sc->aps_sc.sc_dev; dev = sc->sc_dev;
ath_detach(dev); ath_detach(dev);
if (dev->irq) if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
devid = sc->aps_sc.devid; devid = sc->devid;
config->tag = (void *)((unsigned long) devid); config->tag = (void *)((unsigned long) devid);
ahb_disable_wmac(devid, wlanNum); ahb_disable_wmac(devid, wlanNum);
@ -186,7 +179,7 @@ init_ath_wmac(u_int16_t devid, u_int16_t wlanNum, struct ar531x_config *config)
{ {
const char *athname; const char *athname;
struct net_device *dev; struct net_device *dev;
struct ath_ahb_softc *sc; struct ath_softc *sc;
if (((wlanNum != 0) && (wlanNum != 1)) || if (((wlanNum != 0) && (wlanNum != 1)) ||
(sclist[wlanNum] != NULL)) (sclist[wlanNum] != NULL))
@ -194,19 +187,19 @@ init_ath_wmac(u_int16_t devid, u_int16_t wlanNum, struct ar531x_config *config)
ahb_enable_wmac(devid, wlanNum); ahb_enable_wmac(devid, wlanNum);
dev = alloc_netdev(sizeof(struct ath_ahb_softc), "wifi%d", ether_setup); dev = alloc_netdev(sizeof(struct ath_softc), "wifi%d", ether_setup);
if (dev == NULL) { if (dev == NULL) {
printk(KERN_ERR "%s: no memory for device state\n", dev_info); printk(KERN_ERR "%s: no memory for device state\n", dev_info);
goto bad2; goto bad2;
} }
sc = netdev_priv(dev); sc = netdev_priv(dev);
sc->aps_sc.sc_dev = dev; sc->sc_dev = dev;
/* /*
* Mark the device as detached to avoid processing * Mark the device as detached to avoid processing
* interrupts until setup is complete. * interrupts until setup is complete.
*/ */
sc->aps_sc.sc_invalid = 1; sc->sc_invalid = 1;
SET_MODULE_OWNER(dev); SET_MODULE_OWNER(dev);
sclist[wlanNum] = sc; sclist[wlanNum] = sc;
@ -229,8 +222,8 @@ init_ath_wmac(u_int16_t devid, u_int16_t wlanNum, struct ar531x_config *config)
goto bad3; goto bad3;
} }
dev->mem_end = dev->mem_start + AR531X_WLANX_LEN; dev->mem_end = dev->mem_start + AR531X_WLANX_LEN;
sc->aps_sc.sc_iobase = (void __iomem *)dev->mem_start; sc->sc_iobase = (void __iomem *)dev->mem_start;
sc->aps_sc.sc_bdev = NULL; sc->sc_bdev = NULL;
if (request_irq(dev->irq, ath_intr, IRQF_SHARED, dev->name, dev)) { if (request_irq(dev->irq, ath_intr, IRQF_SHARED, dev->name, dev)) {
printk(KERN_WARNING "%s: %s: request_irq failed\n", dev_info, dev->name); printk(KERN_WARNING "%s: %s: request_irq failed\n", dev_info, dev->name);
@ -245,7 +238,7 @@ init_ath_wmac(u_int16_t devid, u_int16_t wlanNum, struct ar531x_config *config)
num_activesc++; num_activesc++;
/* Ready to process interrupts */ /* Ready to process interrupts */
sc->aps_sc.sc_invalid = 0; sc->sc_invalid = 0;
return 0; return 0;
bad4: bad4: