On 26-07-17 22:25, Ian Molton wrote: > Trivial tidy of register definitions. Initially skipped this one, but it is indeed trivial. Reviewed-by: Arend van Spriel <arend.vanspriel@xxxxxxxxxxxx> > Signed-off-by: Ian Molton <ian@xxxxxxxxxxxxxx> comment below... > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h > index 4c81ea24d19c..fb4f24dfc99d 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h > @@ -51,17 +51,18 @@ > > /* function 0 vendor specific CCCR registers */ > > -#define SDIO_CCCR_BRCM_CARDCAP 0xf0 > +#define SDIO_CCCR_BRCM_CARDCAP 0xf0 > #define SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT 0x02 > #define SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT 0x04 > #define SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC 0x08 > + > #define SDIO_CCCR_BRCM_CARDCTRL 0xf1 > #define SDIO_CCCR_BRCM_CARDCTRL_WLANRESET 0x02 > -#define SDIO_CCCR_BRCM_SEPINT 0xf2 > > -#define SDIO_SEPINT_MASK 0x01 > -#define SDIO_SEPINT_OE 0x02 > -#define SDIO_SEPINT_ACT_HI 0x04 > +#define SDIO_CCCR_BRCM_SEPINT 0xf2 > +#define SDIO_SEPINT_MASK 0x01 > +#define SDIO_SEPINT_OE 0x02 > +#define SDIO_SEPINT_ACT_HI 0x04 So the SEPINT definitions are not consistent with the other ones. Maybe drop the SDIO_CCCR from the other value definitions and for the SEPINT replace 'SDIO_' with 'SEPINT_'.