Merge tag 'gpio-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[sfrench/cifs-2.6.git] / drivers / gpio / gpio-amdpt.c

diff --git a/drivers/gpio/gpio-amdpt.c b/drivers/gpio/gpio-amdpt.c
index ad255ba7ece9bab0d08a13a7908eed491465a3a3..44398992ae15f0d7f53a146fb6a71f262e52d62d 100644 (file)
--- a/drivers/gpio/gpio-amdpt.c
+++ b/drivers/gpio/gpio-amdpt.c
@@ -88,7 +88,7 @@ static int pt_gpio_probe(struct platform_device *pdev)
 
        pt_gpio->reg_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(pt_gpio->reg_base)) {
-               dev_err(&pdev->dev, "Failed to map MMIO resource for PT GPIO.\n");
+               dev_err(dev, "Failed to map MMIO resource for PT GPIO.\n");
                return PTR_ERR(pt_gpio->reg_base);
        }
 
@@ -98,7 +98,7 @@ static int pt_gpio_probe(struct platform_device *pdev)
                         pt_gpio->reg_base + PT_DIRECTION_REG, NULL,
                         BGPIOF_READ_OUTPUT_REG_SET);
        if (ret) {
-               dev_err(&pdev->dev, "bgpio_init failed\n");
+               dev_err(dev, "bgpio_init failed\n");
                return ret;
        }
 
@@ -107,11 +107,11 @@ static int pt_gpio_probe(struct platform_device *pdev)
        pt_gpio->gc.free             = pt_gpio_free;
        pt_gpio->gc.ngpio            = PT_TOTAL_GPIO;
 #if defined(CONFIG_OF_GPIO)
-       pt_gpio->gc.of_node          = pdev->dev.of_node;
+       pt_gpio->gc.of_node          = dev->of_node;
 #endif
        ret = gpiochip_add_data(&pt_gpio->gc, pt_gpio);
        if (ret) {
-               dev_err(&pdev->dev, "Failed to register GPIO lib\n");
+               dev_err(dev, "Failed to register GPIO lib\n");
                return ret;
        }
 
@@ -121,7 +121,7 @@ static int pt_gpio_probe(struct platform_device *pdev)
        writel(0, pt_gpio->reg_base + PT_SYNC_REG);
        writel(0, pt_gpio->reg_base + PT_CLOCKRATE_REG);
 
-       dev_dbg(&pdev->dev, "PT GPIO driver loaded\n");
+       dev_dbg(dev, "PT GPIO driver loaded\n");
        return ret;
 }