sh_eth: Fix padding of short frames on TX

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-stp-xway.c

diff --git a/drivers/gpio/gpio-stp-xway.c b/drivers/gpio/gpio-stp-xway.c
index 7e359b7cce1b2190ecd7553a6a312d14fa9f32ff..202361eb72797a92e92f4c02b395c70af0908a3f 100644 (file)
--- a/drivers/gpio/gpio-stp-xway.c
+++ b/drivers/gpio/gpio-stp-xway.c
@@ -199,21 +199,17 @@ static int xway_stp_hw_init(struct xway_stp *chip)
 
 static int xway_stp_probe(struct platform_device *pdev)
 {
-       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       struct resource *res;
        const __be32 *shadow, *groups, *dsl, *phy;
        struct xway_stp *chip;
        struct clk *clk;
        int ret = 0;
 
-       if (!res) {
-               dev_err(&pdev->dev, "failed to request STP resource\n");
-               return -ENOENT;
-       }
-
        chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);
        if (!chip)
                return -ENOMEM;
 
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        chip->virt = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(chip->virt))
                return PTR_ERR(chip->virt);
@@ -287,7 +283,6 @@ static struct platform_driver xway_stp_driver = {
        .probe = xway_stp_probe,
        .driver = {
                .name = "gpio-stp-xway",
-               .owner = THIS_MODULE,
                .of_match_table = xway_stp_match,
        },
 };