| Message ID | 20190325114101.10198-3-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:58PM +0100, marek.vasut@gmail.com wrote: > From: Marek Vasut <marek.vasut+renesas@gmail.com> > > Replace various variable types with u32 or unsigned int type for > variables holding register values, since the registers are 32bit. > Note that rcar_pcie_msi_irq() still uses various variable types > because both find_first_bit() and __fls() require various variable > types as an argument. > > 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: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > --- > V2: - s@unsigned long@various variable types@ in the commit message > - Replace int with unsigned int for the $shift variable > - Replace int with unsigned int / u32 in rcar_pcie_config_access() > V3: - Change shift from u32 to unsigned int > - Change addr and data in phy_write_reg() from unsigned int to u32 > V4: - Change reg to unsigned int in rcar_pcie_config_access() > --- > drivers/pci/controller/pcie-rcar.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c > index 3db693b4410e..6699211fdc9a 100644 > --- a/drivers/pci/controller/pcie-rcar.c > +++ b/drivers/pci/controller/pcie-rcar.c > @@ -170,7 +170,7 @@ enum { > > static void rcar_rmw32(struct rcar_pcie *pcie, int where, u32 mask, u32 data) > { > - int shift = 8 * (where & 3); > + unsigned int shift = 8 * (where & 3); > u32 val = rcar_pci_read_reg(pcie, where & ~3); > > val &= ~(mask << shift); > @@ -180,7 +180,7 @@ static void rcar_rmw32(struct rcar_pcie *pcie, int where, u32 mask, u32 data) > > static u32 rcar_read_conf(struct rcar_pcie *pcie, int where) > { > - int shift = 8 * (where & 3); > + unsigned int shift = 8 * (where & 3); > u32 val = rcar_pci_read_reg(pcie, where & ~3); > > return val >> shift; > @@ -191,7 +191,7 @@ static int rcar_pcie_config_access(struct rcar_pcie *pcie, > unsigned char access_type, struct pci_bus *bus, > unsigned int devfn, int where, u32 *data) > { > - int dev, func, reg, index; > + unsigned int dev, func, reg, index; > > dev = PCI_SLOT(devfn); > func = PCI_FUNC(devfn); > @@ -295,8 +295,9 @@ static int rcar_pcie_write_conf(struct pci_bus *bus, unsigned int devfn, > int where, int size, u32 val) > { > struct rcar_pcie *pcie = bus->sysdata; > - int shift, ret; > + unsigned int shift; > u32 data; > + int ret; > > ret = rcar_pcie_config_access(pcie, RCAR_PCI_ACCESS_READ, > bus, devfn, where, &data); > @@ -506,10 +507,10 @@ static int phy_wait_for_ack(struct rcar_pcie *pcie) > } > > static void phy_write_reg(struct rcar_pcie *pcie, > - unsigned int rate, unsigned int addr, > - unsigned int lane, unsigned int data) > + unsigned int rate, u32 addr, > + unsigned int lane, u32 data) > { > - unsigned long phyaddr; > + u32 phyaddr; > > phyaddr = WRITE_CMD | > ((rate & 1) << RATE_POS) | > @@ -1117,7 +1118,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct rcar_pcie *pcie; > - unsigned int data; > + u32 data; > int err; > int (*phy_init_fn)(struct rcar_pcie *); > struct pci_host_bridge *bridge; > -- > 2.20.1 >
diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c index 3db693b4410e..6699211fdc9a 100644 --- a/drivers/pci/controller/pcie-rcar.c +++ b/drivers/pci/controller/pcie-rcar.c @@ -170,7 +170,7 @@ enum { static void rcar_rmw32(struct rcar_pcie *pcie, int where, u32 mask, u32 data) { - int shift = 8 * (where & 3); + unsigned int shift = 8 * (where & 3); u32 val = rcar_pci_read_reg(pcie, where & ~3); val &= ~(mask << shift); @@ -180,7 +180,7 @@ static void rcar_rmw32(struct rcar_pcie *pcie, int where, u32 mask, u32 data) static u32 rcar_read_conf(struct rcar_pcie *pcie, int where) { - int shift = 8 * (where & 3); + unsigned int shift = 8 * (where & 3); u32 val = rcar_pci_read_reg(pcie, where & ~3); return val >> shift; @@ -191,7 +191,7 @@ static int rcar_pcie_config_access(struct rcar_pcie *pcie, unsigned char access_type, struct pci_bus *bus, unsigned int devfn, int where, u32 *data) { - int dev, func, reg, index; + unsigned int dev, func, reg, index; dev = PCI_SLOT(devfn); func = PCI_FUNC(devfn); @@ -295,8 +295,9 @@ static int rcar_pcie_write_conf(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val) { struct rcar_pcie *pcie = bus->sysdata; - int shift, ret; + unsigned int shift; u32 data; + int ret; ret = rcar_pcie_config_access(pcie, RCAR_PCI_ACCESS_READ, bus, devfn, where, &data); @@ -506,10 +507,10 @@ static int phy_wait_for_ack(struct rcar_pcie *pcie) } static void phy_write_reg(struct rcar_pcie *pcie, - unsigned int rate, unsigned int addr, - unsigned int lane, unsigned int data) + unsigned int rate, u32 addr, + unsigned int lane, u32 data) { - unsigned long phyaddr; + u32 phyaddr; phyaddr = WRITE_CMD | ((rate & 1) << RATE_POS) | @@ -1117,7 +1118,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct rcar_pcie *pcie; - unsigned int data; + u32 data; int err; int (*phy_init_fn)(struct rcar_pcie *); struct pci_host_bridge *bridge;