[00/11] mmc: sdio: Move SDIO IDs from drivers to common include file
mbox series

Message ID 20200522144412.19712-1-pali@kernel.org
Headers show
Series
  • mmc: sdio: Move SDIO IDs from drivers to common include file
Related show

Message

Pali Rohár May 22, 2020, 2:44 p.m. UTC
Most SDIO IDs are defined in the common include file linux/mmc/sdio_ids.h.
But some drivers define IDs locally or do not use existing macros from the
common include file.

This patch series fixes above inconsistency. It defines missing macro names
and moves all remaining SDIO IDs from drivers to the common include file.
Also some macro names are changed to follow existing naming conventions.

Pali Rohár (11):
  mmc: sdio: Fix macro name for Marvell device with ID 0x9134
  mmc: sdio: Change macro names for Marvell 8688 modules
  mmc: sdio: Move SDIO IDs from mwifiex driver to common include file
  mmc: sdio: Move SDIO IDs from btmrvl driver to common include file
  mmc: sdio: Move SDIO IDs from btmtksdio driver to common include file
  mmc: sdio: Move SDIO IDs from smssdio driver to common include file
  mmc: sdio: Move SDIO IDs from ath6kl driver to common include file
  mmc: sdio: Move SDIO IDs from ath10k driver to common include file
  mmc: sdio: Move SDIO IDs from b43-sdio driver to common include file
  mmc: sdio: Fix Cypress SDIO IDs macros in common include file
  mmc: sdio: Sort all SDIO IDs in common include file

 drivers/bluetooth/btmrvl_sdio.c               | 18 ++--
 drivers/bluetooth/btmtksdio.c                 |  4 +-
 drivers/media/mmc/siano/smssdio.c             | 10 +-
 drivers/mmc/core/quirks.h                     |  2 +-
 drivers/net/wireless/ath/ath10k/sdio.c        | 25 ++---
 drivers/net/wireless/ath/ath10k/sdio.h        |  8 --
 drivers/net/wireless/ath/ath6kl/hif.h         |  6 --
 drivers/net/wireless/ath/ath6kl/sdio.c        | 17 ++--
 drivers/net/wireless/broadcom/b43/sdio.c      |  4 +-
 .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  6 +-
 .../broadcom/brcm80211/brcmfmac/sdio.c        |  4 +-
 .../net/wireless/marvell/libertas/if_sdio.c   |  2 +-
 drivers/net/wireless/marvell/mwifiex/sdio.c   | 38 ++------
 include/linux/mmc/sdio_ids.h                  | 94 ++++++++++++++-----
 14 files changed, 120 insertions(+), 118 deletions(-)

Comments

Ulf Hansson May 25, 2020, 7:15 a.m. UTC | #1
On Fri, 22 May 2020 at 16:45, Pali Rohár <pali@kernel.org> wrote:
>
> Most SDIO IDs are defined in the common include file linux/mmc/sdio_ids.h.
> But some drivers define IDs locally or do not use existing macros from the
> common include file.
>
> This patch series fixes above inconsistency. It defines missing macro names
> and moves all remaining SDIO IDs from drivers to the common include file.
> Also some macro names are changed to follow existing naming conventions.

Thanks - a nice cleanup!

I guess this is best queued via my mmc tree, unless bluetooth/wireless
maintainers think there are some problems with that. I will wait for
an ack from them before applying.

Kind regards
Uffe

>
> Pali Rohár (11):
>   mmc: sdio: Fix macro name for Marvell device with ID 0x9134
>   mmc: sdio: Change macro names for Marvell 8688 modules
>   mmc: sdio: Move SDIO IDs from mwifiex driver to common include file
>   mmc: sdio: Move SDIO IDs from btmrvl driver to common include file
>   mmc: sdio: Move SDIO IDs from btmtksdio driver to common include file
>   mmc: sdio: Move SDIO IDs from smssdio driver to common include file
>   mmc: sdio: Move SDIO IDs from ath6kl driver to common include file
>   mmc: sdio: Move SDIO IDs from ath10k driver to common include file
>   mmc: sdio: Move SDIO IDs from b43-sdio driver to common include file
>   mmc: sdio: Fix Cypress SDIO IDs macros in common include file
>   mmc: sdio: Sort all SDIO IDs in common include file
>
>  drivers/bluetooth/btmrvl_sdio.c               | 18 ++--
>  drivers/bluetooth/btmtksdio.c                 |  4 +-
>  drivers/media/mmc/siano/smssdio.c             | 10 +-
>  drivers/mmc/core/quirks.h                     |  2 +-
>  drivers/net/wireless/ath/ath10k/sdio.c        | 25 ++---
>  drivers/net/wireless/ath/ath10k/sdio.h        |  8 --
>  drivers/net/wireless/ath/ath6kl/hif.h         |  6 --
>  drivers/net/wireless/ath/ath6kl/sdio.c        | 17 ++--
>  drivers/net/wireless/broadcom/b43/sdio.c      |  4 +-
>  .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  6 +-
>  .../broadcom/brcm80211/brcmfmac/sdio.c        |  4 +-
>  .../net/wireless/marvell/libertas/if_sdio.c   |  2 +-
>  drivers/net/wireless/marvell/mwifiex/sdio.c   | 38 ++------
>  include/linux/mmc/sdio_ids.h                  | 94 ++++++++++++++-----
>  14 files changed, 120 insertions(+), 118 deletions(-)
>
> --
> 2.20.1
>
Ulf Hansson May 28, 2020, 10:13 a.m. UTC | #2
On Mon, 25 May 2020 at 09:15, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>
> On Fri, 22 May 2020 at 16:45, Pali Rohár <pali@kernel.org> wrote:
> >
> > Most SDIO IDs are defined in the common include file linux/mmc/sdio_ids.h.
> > But some drivers define IDs locally or do not use existing macros from the
> > common include file.
> >
> > This patch series fixes above inconsistency. It defines missing macro names
> > and moves all remaining SDIO IDs from drivers to the common include file.
> > Also some macro names are changed to follow existing naming conventions.
>
> Thanks - a nice cleanup!
>
> I guess this is best queued via my mmc tree, unless bluetooth/wireless
> maintainers think there are some problems with that. I will wait for
> an ack from them before applying.

It's getting late for v5.8, so I decided to queue this up as it's
rather trivial changes. If anyone has an objection, please let me
know.

Thanks!

Kind regards
Uffe


>
> Kind regards
> Uffe
>
> >
> > Pali Rohár (11):
> >   mmc: sdio: Fix macro name for Marvell device with ID 0x9134
> >   mmc: sdio: Change macro names for Marvell 8688 modules
> >   mmc: sdio: Move SDIO IDs from mwifiex driver to common include file
> >   mmc: sdio: Move SDIO IDs from btmrvl driver to common include file
> >   mmc: sdio: Move SDIO IDs from btmtksdio driver to common include file
> >   mmc: sdio: Move SDIO IDs from smssdio driver to common include file
> >   mmc: sdio: Move SDIO IDs from ath6kl driver to common include file
> >   mmc: sdio: Move SDIO IDs from ath10k driver to common include file
> >   mmc: sdio: Move SDIO IDs from b43-sdio driver to common include file
> >   mmc: sdio: Fix Cypress SDIO IDs macros in common include file
> >   mmc: sdio: Sort all SDIO IDs in common include file
> >
> >  drivers/bluetooth/btmrvl_sdio.c               | 18 ++--
> >  drivers/bluetooth/btmtksdio.c                 |  4 +-
> >  drivers/media/mmc/siano/smssdio.c             | 10 +-
> >  drivers/mmc/core/quirks.h                     |  2 +-
> >  drivers/net/wireless/ath/ath10k/sdio.c        | 25 ++---
> >  drivers/net/wireless/ath/ath10k/sdio.h        |  8 --
> >  drivers/net/wireless/ath/ath6kl/hif.h         |  6 --
> >  drivers/net/wireless/ath/ath6kl/sdio.c        | 17 ++--
> >  drivers/net/wireless/broadcom/b43/sdio.c      |  4 +-
> >  .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  6 +-
> >  .../broadcom/brcm80211/brcmfmac/sdio.c        |  4 +-
> >  .../net/wireless/marvell/libertas/if_sdio.c   |  2 +-
> >  drivers/net/wireless/marvell/mwifiex/sdio.c   | 38 ++------
> >  include/linux/mmc/sdio_ids.h                  | 94 ++++++++++++++-----
> >  14 files changed, 120 insertions(+), 118 deletions(-)
> >
> > --
> > 2.20.1
> >