Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e40bcfa authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k: distinguish between device initialization and ath_softc init 



We re-label the device driver initialization routines from the
ath_softc, the "Software Carrier" fillers. This should make it
clearer what each of these do.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f637cfd6

drivers/net/wireless/ath/ath9k/ahb.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int ath_ahb_probe(struct platform_device *pdev) 
	sc->bus_ops = &ath_ahb_bus_ops;

	sc->irq = irq;



	ret = ath_attach(AR5416_AR9100_DEVID, sc);

	ret = ath_init_device(AR5416_AR9100_DEVID, sc);

	if (ret != 0) {

		dev_err(&pdev->dev, "failed to attach device, err=%d\n", ret);

		ret = -ENODEV;

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −1
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ extern struct ieee80211_ops ath9k_ops; 


irqreturn_t ath_isr(int irq, void *dev);

void ath_cleanup(struct ath_softc *sc);

int ath_attach(u16 devid, struct ath_softc *sc);

int ath_init_device(u16 devid, struct ath_softc *sc);

void ath_detach(struct ath_softc *sc);

const char *ath_mac_bb_name(u32 mac_bb_version);

const char *ath_rf_name(u16 rf_version);

drivers/net/wireless/ath/ath9k/main.c

+10 −3
Original line number Diff line number Diff line
@@ -1292,7 +1292,13 @@ static int ath9k_reg_notifier(struct wiphy *wiphy, 
	return ath_reg_notifier_apply(wiphy, request, reg);

}



static int ath_init(u16 devid, struct ath_softc *sc)

/*

 * Initialize and fill ath_softc, ath_sofct is the

 * "Software Carrier" struct. Historically it has existed

 * to allow the separation between hardware specific

 * variables (now in ath_hw) and driver specific variables.

 */

static int ath_init_softc(u16 devid, struct ath_softc *sc)

{

	struct ath_hw *ah = NULL;

	int r = 0, i;
@@ -1558,7 +1564,8 @@ void ath_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 
			&sc->sbands[IEEE80211_BAND_5GHZ];

}



int ath_attach(u16 devid, struct ath_softc *sc)

/* Device driver core initialization */

int ath_init_device(u16 devid, struct ath_softc *sc)

{

	struct ieee80211_hw *hw = sc->hw;

	int error = 0, i;
@@ -1566,7 +1573,7 @@ int ath_attach(u16 devid, struct ath_softc *sc) 


	DPRINTF(sc, ATH_DBG_CONFIG, "Attach ATH hw\n");



	error = ath_init(devid, sc);

	error = ath_init_softc(devid, sc);

	if (error != 0)

		return error;

drivers/net/wireless/ath/ath9k/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	sc->mem = mem;

	sc->bus_ops = &ath_pci_bus_ops;



	if (ath_attach(id->device, sc) != 0) {

	if (ath_init_device(id->device, sc) != 0) {

		ret = -ENODEV;

		goto bad3;

	}