ath9k: remove gpio chip owner field to fix module unloading

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
index 405ca11cb9a10bdbd1eaa94245a27fbb78a836c0..32e46ee945060cefd090abec61290c29f1f2a888 100644 (file)
--- a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
+++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
@@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #ifdef CPTCFG_ATH9K_DEBUGFS
 --- a/drivers/net/wireless/ath/ath9k/gpio.c
 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -16,13 +16,135 @@
+@@ -16,13 +16,134 @@
  
  #include "ath9k.h"
  #include <linux/ath9k_platform.h>
@@ -138,7 +138,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +      gc->gchip.get_direction = ath9k_gpio_pin_get_dir;
 +      gc->gchip.get = ath9k_gpio_pin_get;
 +      gc->gchip.set = ath9k_gpio_pin_set;
-+      gc->gchip.owner = THIS_MODULE;
 +
 +      if (gpiochip_add(&gc->gchip)) {
 +              kfree(gc);
@@ -183,7 +182,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static void ath_fill_led_pin(struct ath_softc *sc)
  {
        struct ath_hw *ah = sc->sc_ah;
-@@ -80,6 +202,12 @@ static int ath_add_led(struct ath_softc
+@@ -80,6 +201,12 @@ static int ath_add_led(struct ath_softc
        else
                ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
  
@@ -196,7 +195,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        return 0;
  }
  
-@@ -136,12 +264,18 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -136,12 +263,18 @@ void ath_deinit_leds(struct ath_softc *s
  
        while (!list_empty(&sc->leds)) {
                led = list_first_entry(&sc->leds, struct ath_led, list);
@@ -215,7 +214,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  }
  
  void ath_init_leds(struct ath_softc *sc)
-@@ -158,6 +292,8 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -158,6 +291,8 @@ void ath_init_leds(struct ath_softc *sc)
  
        ath_fill_led_pin(sc);
  
@@ -224,7 +223,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (pdata && pdata->led_name)
                strncpy(led_name, pdata->led_name, sizeof(led_name));
        else
-@@ -178,6 +314,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -178,6 +313,7 @@ void ath_init_leds(struct ath_softc *sc)
        for (i = 0; i < pdata->num_leds; i++)
                ath_create_platform_led(sc, &pdata->leds[i]);
  }

diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
index d962eda978cfbca9e7b4e615b312614f1698a0bb..25496106ae81e867b8f6158c9167477b90200549 100644 (file)
--- a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
+++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
@@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  #ifdef CPTCFG_MAC80211_LEDS
  
-@@ -129,6 +131,64 @@ static void ath9k_unregister_gpio_chip(s
+@@ -128,6 +130,64 @@ static void ath9k_unregister_gpio_chip(s
        sc->gpiochip = NULL;
  }
  
@@ -94,7 +94,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #else /* CONFIG_GPIOLIB */
  
  static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
-@@ -139,6 +199,14 @@ static inline void ath9k_unregister_gpio
+@@ -138,6 +198,14 @@ static inline void ath9k_unregister_gpio
  {
  }
  
@@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #endif /* CONFIG_GPIOLIB */
  
  /********************************/
-@@ -262,6 +330,7 @@ void ath_deinit_leds(struct ath_softc *s
+@@ -261,6 +329,7 @@ void ath_deinit_leds(struct ath_softc *s
  {
        struct ath_led *led;
  
@@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        while (!list_empty(&sc->leds)) {
                led = list_first_entry(&sc->leds, struct ath_led, list);
  #ifdef CONFIG_GPIOLIB
-@@ -293,6 +362,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -292,6 +361,7 @@ void ath_init_leds(struct ath_softc *sc)
        ath_fill_led_pin(sc);
  
        ath9k_register_gpio_chip(sc);
@@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        if (pdata && pdata->led_name)
                strncpy(led_name, pdata->led_name, sizeof(led_name));
-@@ -308,7 +378,7 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -307,7 +377,7 @@ void ath_init_leds(struct ath_softc *sc)
        ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
                           !sc->sc_ah->config.led_active_high);