1 files 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;