| Message ID | 20191018125234.21825-3-linux@rasmusvillemoes.dk (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | towards QE support on ARM | expand |
Le 18/10/2019 à 14:52, Rasmus Villemoes a écrit : > The actual io accessors (e.g. in_be32) implicitly add a volatile > qualifier to their address argument. Remove volatile from the struct > definition and the qe_ic_(read/write) helpers, in preparation for > switching from the ppc-specific io accessors to generic ones. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > --- > drivers/soc/fsl/qe/qe_ic.c | 4 ++-- > drivers/soc/fsl/qe/qe_ic.h | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/soc/fsl/qe/qe_ic.c > index 9bac546998d3..9694569dcc76 100644 > --- a/drivers/soc/fsl/qe/qe_ic.c > +++ b/drivers/soc/fsl/qe/qe_ic.c > @@ -171,12 +171,12 @@ static struct qe_ic_info qe_ic_info[] = { > }, > }; > > -static inline u32 qe_ic_read(volatile __be32 __iomem * base, unsigned int reg) > +static inline u32 qe_ic_read(__be32 __iomem * base, unsigned int reg) No space between '*' and 'base' please > { > return in_be32(base + (reg >> 2)); > } > > -static inline void qe_ic_write(volatile __be32 __iomem * base, unsigned int reg, > +static inline void qe_ic_write(__be32 __iomem * base, unsigned int reg, same > u32 value) > { > out_be32(base + (reg >> 2), value); > diff --git a/drivers/soc/fsl/qe/qe_ic.h b/drivers/soc/fsl/qe/qe_ic.h > index 08c695672a03..9420378d9b6b 100644 > --- a/drivers/soc/fsl/qe/qe_ic.h > +++ b/drivers/soc/fsl/qe/qe_ic.h > @@ -72,7 +72,7 @@ > > struct qe_ic { > /* Control registers offset */ > - volatile u32 __iomem *regs; > + u32 __iomem *regs; > > /* The remapper for this QEIC */ > struct irq_domain *irqhost; > Christophe
diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/soc/fsl/qe/qe_ic.c index 9bac546998d3..9694569dcc76 100644 --- a/drivers/soc/fsl/qe/qe_ic.c +++ b/drivers/soc/fsl/qe/qe_ic.c @@ -171,12 +171,12 @@ static struct qe_ic_info qe_ic_info[] = { }, }; -static inline u32 qe_ic_read(volatile __be32 __iomem * base, unsigned int reg) +static inline u32 qe_ic_read(__be32 __iomem * base, unsigned int reg) { return in_be32(base + (reg >> 2)); } -static inline void qe_ic_write(volatile __be32 __iomem * base, unsigned int reg, +static inline void qe_ic_write(__be32 __iomem * base, unsigned int reg, u32 value) { out_be32(base + (reg >> 2), value); diff --git a/drivers/soc/fsl/qe/qe_ic.h b/drivers/soc/fsl/qe/qe_ic.h index 08c695672a03..9420378d9b6b 100644 --- a/drivers/soc/fsl/qe/qe_ic.h +++ b/drivers/soc/fsl/qe/qe_ic.h @@ -72,7 +72,7 @@ struct qe_ic { /* Control registers offset */ - volatile u32 __iomem *regs; + u32 __iomem *regs; /* The remapper for this QEIC */ struct irq_domain *irqhost;
The actual io accessors (e.g. in_be32) implicitly add a volatile qualifier to their address argument. Remove volatile from the struct definition and the qe_ic_(read/write) helpers, in preparation for switching from the ppc-specific io accessors to generic ones. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- drivers/soc/fsl/qe/qe_ic.c | 4 ++-- drivers/soc/fsl/qe/qe_ic.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)