| Message ID | 20190325114101.10198-1-marek.vasut@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | [V4,1/6] PCI: rcar: Clean up remaining macros defining bits | expand |
On Mon, Mar 25, 2019 at 12:40:56PM +0100, marek.vasut@gmail.com wrote: > From: Marek Vasut <marek.vasut+renesas@gmail.com> > > Replace macros using constants with BIT()s instead, no functional change. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Phil Edworthy <phil.edworthy@renesas.com> > Cc: Simon Horman <horms+renesas@verge.net.au> > Cc: Wolfram Sang <wsa@the-dreams.de> > Cc: linux-renesas-soc@vger.kernel.org > To: linux-pci@vger.kernel.org > Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > V2: Bundle this patch with other cleanups before resending > V3: Add Wolfram's R-B > V4: Add Geert's R-B > --- > drivers/pci/controller/pcie-rcar.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Hi Marek, I assume this series makes: https://patchwork.ozlabs.org/patch/1053779/ https://patchwork.ozlabs.org/patch/1057454/ obsolete, please let me know and I will drop them from the PCI patches queue, I will get to this series later for v5.2. Thanks, Lorenzo > > diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c > index c8febb009454..5b8736f0cd6b 100644 > --- a/drivers/pci/controller/pcie-rcar.c > +++ b/drivers/pci/controller/pcie-rcar.c > @@ -46,14 +46,14 @@ > > /* Transfer control */ > #define PCIETCTLR 0x02000 > -#define CFINIT 1 > +#define CFINIT BIT(0) > #define PCIETSTR 0x02004 > -#define DATA_LINK_ACTIVE 1 > +#define DATA_LINK_ACTIVE BIT(0) > #define PCIEERRFR 0x02020 > #define UNSUPPORTED_REQUEST BIT(4) > #define PCIEMSIFR 0x02044 > #define PCIEMSIALR 0x02048 > -#define MSIFE 1 > +#define MSIFE BIT(0) > #define PCIEMSIAUR 0x0204c > #define PCIEMSIIER 0x02050 > > -- > 2.20.1 >
On 3/26/19 2:04 PM, Lorenzo Pieralisi wrote: > On Mon, Mar 25, 2019 at 12:40:56PM +0100, marek.vasut@gmail.com wrote: >> From: Marek Vasut <marek.vasut+renesas@gmail.com> >> >> Replace macros using constants with BIT()s instead, no functional change. >> >> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> >> Cc: Geert Uytterhoeven <geert+renesas@glider.be> >> Cc: Phil Edworthy <phil.edworthy@renesas.com> >> Cc: Simon Horman <horms+renesas@verge.net.au> >> Cc: Wolfram Sang <wsa@the-dreams.de> >> Cc: linux-renesas-soc@vger.kernel.org >> To: linux-pci@vger.kernel.org >> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> >> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> >> --- >> V2: Bundle this patch with other cleanups before resending >> V3: Add Wolfram's R-B >> V4: Add Geert's R-B >> --- >> drivers/pci/controller/pcie-rcar.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) > > Hi Marek, Hi, > I assume this series makes: > > https://patchwork.ozlabs.org/patch/1053779/ > https://patchwork.ozlabs.org/patch/1057454/ > > obsolete, please let me know and I will drop > them from the PCI patches queue, I will get to > this series later for v5.2. Yes, I decided to merge the two series together to make it easier to pick. Thanks
On Mon, Mar 25, 2019 at 12:40:56PM +0100, marek.vasut@gmail.com wrote: > From: Marek Vasut <marek.vasut+renesas@gmail.com> > > Replace macros using constants with BIT()s instead, no functional change. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Phil Edworthy <phil.edworthy@renesas.com> > Cc: Simon Horman <horms+renesas@verge.net.au> > Cc: Wolfram Sang <wsa@the-dreams.de> > Cc: linux-renesas-soc@vger.kernel.org > To: linux-pci@vger.kernel.org > Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > --- > V2: Bundle this patch with other cleanups before resending > V3: Add Wolfram's R-B > V4: Add Geert's R-B > --- > drivers/pci/controller/pcie-rcar.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c > index c8febb009454..5b8736f0cd6b 100644 > --- a/drivers/pci/controller/pcie-rcar.c > +++ b/drivers/pci/controller/pcie-rcar.c > @@ -46,14 +46,14 @@ > > /* Transfer control */ > #define PCIETCTLR 0x02000 > -#define CFINIT 1 > +#define CFINIT BIT(0) > #define PCIETSTR 0x02004 > -#define DATA_LINK_ACTIVE 1 > +#define DATA_LINK_ACTIVE BIT(0) > #define PCIEERRFR 0x02020 > #define UNSUPPORTED_REQUEST BIT(4) > #define PCIEMSIFR 0x02044 > #define PCIEMSIALR 0x02048 > -#define MSIFE 1 > +#define MSIFE BIT(0) > #define PCIEMSIAUR 0x0204c > #define PCIEMSIIER 0x02050 > > -- > 2.20.1 >
On Mon, Mar 25, 2019 at 12:40:56PM +0100, marek.vasut@gmail.com wrote: > From: Marek Vasut <marek.vasut+renesas@gmail.com> > > Replace macros using constants with BIT()s instead, no functional change. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Phil Edworthy <phil.edworthy@renesas.com> > Cc: Simon Horman <horms+renesas@verge.net.au> > Cc: Wolfram Sang <wsa@the-dreams.de> > Cc: linux-renesas-soc@vger.kernel.org > To: linux-pci@vger.kernel.org > Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > V2: Bundle this patch with other cleanups before resending > V3: Add Wolfram's R-B > V4: Add Geert's R-B > --- > drivers/pci/controller/pcie-rcar.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Applied the series to pci/rcar for v5.2, thanks. Lorenzo > diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c > index c8febb009454..5b8736f0cd6b 100644 > --- a/drivers/pci/controller/pcie-rcar.c > +++ b/drivers/pci/controller/pcie-rcar.c > @@ -46,14 +46,14 @@ > > /* Transfer control */ > #define PCIETCTLR 0x02000 > -#define CFINIT 1 > +#define CFINIT BIT(0) > #define PCIETSTR 0x02004 > -#define DATA_LINK_ACTIVE 1 > +#define DATA_LINK_ACTIVE BIT(0) > #define PCIEERRFR 0x02020 > #define UNSUPPORTED_REQUEST BIT(4) > #define PCIEMSIFR 0x02044 > #define PCIEMSIALR 0x02048 > -#define MSIFE 1 > +#define MSIFE BIT(0) > #define PCIEMSIAUR 0x0204c > #define PCIEMSIIER 0x02050 > > -- > 2.20.1 >
diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c index c8febb009454..5b8736f0cd6b 100644 --- a/drivers/pci/controller/pcie-rcar.c +++ b/drivers/pci/controller/pcie-rcar.c @@ -46,14 +46,14 @@ /* Transfer control */ #define PCIETCTLR 0x02000 -#define CFINIT 1 +#define CFINIT BIT(0) #define PCIETSTR 0x02004 -#define DATA_LINK_ACTIVE 1 +#define DATA_LINK_ACTIVE BIT(0) #define PCIEERRFR 0x02020 #define UNSUPPORTED_REQUEST BIT(4) #define PCIEMSIFR 0x02044 #define PCIEMSIALR 0x02048 -#define MSIFE 1 +#define MSIFE BIT(0) #define PCIEMSIAUR 0x0204c #define PCIEMSIIER 0x02050