| Message ID | 20240903202713.471489-1-rosenp@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Toke Høiland-Jørgensen |
| Headers | show |
| Series | wireless: ath9k: eeprom: remove platform data | expand |
Rosen Penev <rosenp@gmail.com> writes: > There are no more board files defining platform data for this driver and > eeprom support through NVMEM has already been implemented. No need to > keep this old functionality around. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> > --- > As an aside, the last user of this functionality downstream in OpenWrt > has been removed: https://github.com/openwrt/openwrt/commit/7ac8279bd > > drivers/net/wireless/ath/ath9k/eeprom.c | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c > index efb7889142d4..df58dc02e104 100644 > --- a/drivers/net/wireless/ath/ath9k/eeprom.c > +++ b/drivers/net/wireless/ath/ath9k/eeprom.c > @@ -15,7 +15,6 @@ > */ > > #include "hw.h" > -#include <linux/ath9k_platform.h> What about the file include/linux/ath9k_platform.h? That should be also removed, right?
On 9/4/2024 1:05 AM, Kalle Valo wrote: > Rosen Penev <rosenp@gmail.com> writes: > >> There are no more board files defining platform data for this driver and >> eeprom support through NVMEM has already been implemented. No need to >> keep this old functionality around. >> >> Signed-off-by: Rosen Penev <rosenp@gmail.com> >> --- >> As an aside, the last user of this functionality downstream in OpenWrt >> has been removed: https://github.com/openwrt/openwrt/commit/7ac8279bd >> >> drivers/net/wireless/ath/ath9k/eeprom.c | 12 ------------ >> 1 file changed, 12 deletions(-) >> >> diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c >> index efb7889142d4..df58dc02e104 100644 >> --- a/drivers/net/wireless/ath/ath9k/eeprom.c >> +++ b/drivers/net/wireless/ath/ath9k/eeprom.c >> @@ -15,7 +15,6 @@ >> */ >> >> #include "hw.h" >> -#include <linux/ath9k_platform.h> > > What about the file include/linux/ath9k_platform.h? That should be also > removed, right? That file is still used by other functionality (see init.c, btcoex.c) But seems that at a minimum unused eeprom-related stuff should be removed from struct ath9k_platform_data. Please review that all of the platform-related code in init.c is still needed, especially code related to eeprom support. /jeff
On Wed, Sep 4, 2024 at 7:53 AM Jeff Johnson <quic_jjohnson@quicinc.com> wrote: > > On 9/4/2024 1:05 AM, Kalle Valo wrote: > > Rosen Penev <rosenp@gmail.com> writes: > > > >> There are no more board files defining platform data for this driver and > >> eeprom support through NVMEM has already been implemented. No need to > >> keep this old functionality around. > >> > >> Signed-off-by: Rosen Penev <rosenp@gmail.com> > >> --- > >> As an aside, the last user of this functionality downstream in OpenWrt > >> has been removed: https://github.com/openwrt/openwrt/commit/7ac8279bd > >> > >> drivers/net/wireless/ath/ath9k/eeprom.c | 12 ------------ > >> 1 file changed, 12 deletions(-) > >> > >> diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c > >> index efb7889142d4..df58dc02e104 100644 > >> --- a/drivers/net/wireless/ath/ath9k/eeprom.c > >> +++ b/drivers/net/wireless/ath/ath9k/eeprom.c > >> @@ -15,7 +15,6 @@ > >> */ > >> > >> #include "hw.h" > >> -#include <linux/ath9k_platform.h> > > > > What about the file include/linux/ath9k_platform.h? That should be also > > removed, right? > > That file is still used by other functionality (see init.c, btcoex.c) > But seems that at a minimum unused eeprom-related stuff should be removed from > struct ath9k_platform_data. That's why I kept my changes to a minimum. I don't yet want to axe the other stuff. OpenWrt has a ton of non upstreamed patches for ath9k, some probably relying on ath9k_platform_data. I need to do real careful analysis to remove the rest. > > Please review that all of the platform-related code in init.c is still needed, > especially code related to eeprom support. > > /jeff >
On Wed, Sep 4, 2024 at 10:56 AM Rosen Penev <rosenp@gmail.com> wrote: > > On Wed, Sep 4, 2024 at 7:53 AM Jeff Johnson <quic_jjohnson@quicinc.com> wrote: > > > > On 9/4/2024 1:05 AM, Kalle Valo wrote: > > > Rosen Penev <rosenp@gmail.com> writes: > > > > > >> There are no more board files defining platform data for this driver and > > >> eeprom support through NVMEM has already been implemented. No need to > > >> keep this old functionality around. > > >> > > >> Signed-off-by: Rosen Penev <rosenp@gmail.com> > > >> --- > > >> As an aside, the last user of this functionality downstream in OpenWrt > > >> has been removed: https://github.com/openwrt/openwrt/commit/7ac8279bd > > >> > > >> drivers/net/wireless/ath/ath9k/eeprom.c | 12 ------------ > > >> 1 file changed, 12 deletions(-) > > >> > > >> diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c > > >> index efb7889142d4..df58dc02e104 100644 > > >> --- a/drivers/net/wireless/ath/ath9k/eeprom.c > > >> +++ b/drivers/net/wireless/ath/ath9k/eeprom.c > > >> @@ -15,7 +15,6 @@ > > >> */ > > >> > > >> #include "hw.h" > > >> -#include <linux/ath9k_platform.h> > > > > > > What about the file include/linux/ath9k_platform.h? That should be also > > > removed, right? > > > > That file is still used by other functionality (see init.c, btcoex.c) > > But seems that at a minimum unused eeprom-related stuff should be removed from > > struct ath9k_platform_data. > That's why I kept my changes to a minimum. I don't yet want to axe the > other stuff. OpenWrt has a ton of non upstreamed patches for ath9k, > some probably relying on ath9k_platform_data. I need to do real > careful analysis to remove the rest. > > > > Please review that all of the platform-related code in init.c is still needed, > > especially code related to eeprom support. That's handled with nvmem and OF (if applicable). Anyway, I split up the removal in 4 patches. of_init needs some extra functionality to match platform_device. Does Documentation need to go in its own commit? > > > > /jeff > >
Rosen Penev <rosenp@gmail.com> writes: > On Wed, Sep 4, 2024 at 10:56 AM Rosen Penev <rosenp@gmail.com> wrote: > >> >> On Wed, Sep 4, 2024 at 7:53 AM Jeff Johnson <quic_jjohnson@quicinc.com> wrote: >> > >> > On 9/4/2024 1:05 AM, Kalle Valo wrote: >> > > Rosen Penev <rosenp@gmail.com> writes: >> > > >> > >> There are no more board files defining platform data for this driver and >> > >> eeprom support through NVMEM has already been implemented. No need to >> > >> keep this old functionality around. >> > >> >> > >> Signed-off-by: Rosen Penev <rosenp@gmail.com> >> > >> --- >> > >> As an aside, the last user of this functionality downstream in OpenWrt >> > >> has been removed: https://github.com/openwrt/openwrt/commit/7ac8279bd >> > >> >> > >> drivers/net/wireless/ath/ath9k/eeprom.c | 12 ------------ >> > >> 1 file changed, 12 deletions(-) >> > >> >> > >> diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c >> > >> index efb7889142d4..df58dc02e104 100644 >> > >> --- a/drivers/net/wireless/ath/ath9k/eeprom.c >> > >> +++ b/drivers/net/wireless/ath/ath9k/eeprom.c >> > >> @@ -15,7 +15,6 @@ >> > >> */ >> > >> >> > >> #include "hw.h" >> > >> -#include <linux/ath9k_platform.h> >> > > >> > > What about the file include/linux/ath9k_platform.h? That should be also >> > > removed, right? >> > >> > That file is still used by other functionality (see init.c, btcoex.c) >> > But seems that at a minimum unused eeprom-related stuff should be removed from >> > struct ath9k_platform_data. >> That's why I kept my changes to a minimum. I don't yet want to axe the >> other stuff. OpenWrt has a ton of non upstreamed patches for ath9k, >> some probably relying on ath9k_platform_data. I need to do real >> careful analysis to remove the rest. >> > >> > Please review that all of the platform-related code in init.c is still needed, >> > especially code related to eeprom support. > > That's handled with nvmem and OF (if applicable). > > Anyway, I split up the removal in 4 patches. of_init needs some extra > functionality to match platform_device. > > Does Documentation need to go in its own commit? I don't know what Documentation changes you are doing but usually it's good to make changes to Documentation in separate patches.
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c index efb7889142d4..df58dc02e104 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom.c +++ b/drivers/net/wireless/ath/ath9k/eeprom.c @@ -15,7 +15,6 @@ */ #include "hw.h" -#include <linux/ath9k_platform.h> void ath9k_hw_analog_shift_regwrite(struct ath_hw *ah, u32 reg, u32 val) { @@ -119,14 +118,6 @@ static bool ath9k_hw_nvram_read_array(u16 *blob, size_t blob_size, return true; } -static bool ath9k_hw_nvram_read_pdata(struct ath9k_platform_data *pdata, - off_t offset, u16 *data) -{ - return ath9k_hw_nvram_read_array(pdata->eeprom_data, - ARRAY_SIZE(pdata->eeprom_data), - offset, data); -} - static bool ath9k_hw_nvram_read_firmware(const struct firmware *eeprom_blob, off_t offset, u16 *data) { @@ -146,15 +137,12 @@ static bool ath9k_hw_nvram_read_nvmem(struct ath_hw *ah, off_t offset, bool ath9k_hw_nvram_read(struct ath_hw *ah, u32 off, u16 *data) { struct ath_common *common = ath9k_hw_common(ah); - struct ath9k_platform_data *pdata = ah->dev->platform_data; bool ret; if (ah->nvmem_blob) ret = ath9k_hw_nvram_read_nvmem(ah, off, data); else if (ah->eeprom_blob) ret = ath9k_hw_nvram_read_firmware(ah->eeprom_blob, off, data); - else if (pdata && !pdata->use_eeprom) - ret = ath9k_hw_nvram_read_pdata(pdata, off, data); else ret = common->bus_ops->eeprom_read(common, off, data);
There are no more board files defining platform data for this driver and eeprom support through NVMEM has already been implemented. No need to keep this old functionality around. Signed-off-by: Rosen Penev <rosenp@gmail.com> --- As an aside, the last user of this functionality downstream in OpenWrt has been removed: https://github.com/openwrt/openwrt/commit/7ac8279bd drivers/net/wireless/ath/ath9k/eeprom.c | 12 ------------ 1 file changed, 12 deletions(-)