1 --- a/drivers/net/wireless/ath/ath9k/init.c
2 +++ b/drivers/net/wireless/ath/ath9k/init.c
3 @@ -474,8 +474,7 @@ static int ath9k_init_soc_platform(struc
7 - if (pdata->tx_gain_buffalo)
8 - ah->config.tx_gain_buffalo = true;
9 + ah->config.tx_gain_buffalo = true;
13 @@ -508,7 +507,7 @@ static int ath9k_init_softc(u16 devid, s
14 sc->tx99_power = MAX_RATE_POWER + 1;
15 init_waitqueue_head(&sc->tx_wait);
17 - if (!pdata || pdata->use_eeprom) {
19 ah->ah_flags |= AH_USE_EEPROM;
20 sc->sc_ah->led_pin = -1;
22 --- a/include/linux/ath9k_platform.h
23 +++ b/include/linux/ath9k_platform.h
24 @@ -33,15 +33,12 @@ struct ath9k_platform_data {
28 - bool tx_gain_buffalo;
32 int (*get_mac_revision)(void);
33 int (*external_reset)(void);
38 const struct gpio_led *leds;
40 --- a/drivers/net/wireless/ath/ath9k/pci.c
41 +++ b/drivers/net/wireless/ath/ath9k/pci.c
42 @@ -687,7 +687,7 @@ static bool ath_pci_eeprom_read(struct a
43 struct ath_softc *sc = (struct ath_softc *) common->priv;
44 struct ath9k_platform_data *pdata = sc->dev->platform_data;
46 - if (pdata && !pdata->use_eeprom) {
48 if (off >= (ARRAY_SIZE(pdata->eeprom_data))) {
50 "%s: eeprom read failed, offset %08x is out of range\n",