diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ahb.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ahb.c | 11 | 
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c index 072e4b53106..be3eb2a8d60 100644 --- a/drivers/net/wireless/ath/ath9k/ahb.c +++ b/drivers/net/wireless/ath/ath9k/ahb.c @@ -39,6 +39,10 @@ static const struct platform_device_id ath9k_platform_id_table[] = {  		.name = "qca955x_wmac",  		.driver_data = AR9300_DEVID_QCA955X,  	}, +	{ +		.name = "qca953x_wmac", +		.driver_data = AR9300_DEVID_AR953X, +	},  	{},  }; @@ -54,7 +58,7 @@ static bool ath_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data)  	struct platform_device *pdev = to_platform_device(sc->dev);  	struct ath9k_platform_data *pdata; -	pdata = (struct ath9k_platform_data *) pdev->dev.platform_data; +	pdata = dev_get_platdata(&pdev->dev);  	if (off >= (ARRAY_SIZE(pdata->eeprom_data))) {  		ath_err(common,  			"%s: flash read failed, offset %08x is out of range\n", @@ -84,7 +88,7 @@ static int ath_ahb_probe(struct platform_device *pdev)  	struct ath_hw *ah;  	char hw_name[64]; -	if (!pdev->dev.platform_data) { +	if (!dev_get_platdata(&pdev->dev)) {  		dev_err(&pdev->dev, "no platform data specified\n");  		return -EINVAL;  	} @@ -124,9 +128,6 @@ static int ath_ahb_probe(struct platform_device *pdev)  	sc->mem = mem;  	sc->irq = irq; -	/* Will be cleared in ath9k_start() */ -	set_bit(SC_OP_INVALID, &sc->sc_flags); -  	ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc);  	if (ret) {  		dev_err(&pdev->dev, "request_irq failed\n");  | 
