|
|
@@ -61,8 +61,8 @@ Fixes: 3b0213d56eb7 ("gpio: Add GPIO support for Broadcom STB SoCs")
|
|
|
if (offset >= gc->ngpio || offset < 0)
|
|
|
return -EINVAL;
|
|
|
|
|
|
-@@ -598,8 +598,8 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
- const __be32 *p;
|
|
|
+@@ -596,8 +596,8 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
+ struct resource *res;
|
|
|
u32 bank_width;
|
|
|
int num_banks = 0;
|
|
|
+ int num_gpios = 0;
|
|
|
@@ -71,7 +71,7 @@ Fixes: 3b0213d56eb7 ("gpio: Add GPIO support for Broadcom STB SoCs")
|
|
|
unsigned long flags = 0;
|
|
|
bool need_wakeup_event = false;
|
|
|
|
|
|
-@@ -613,7 +613,6 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
+@@ -611,7 +611,6 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
if (IS_ERR(reg_base))
|
|
|
return PTR_ERR(reg_base);
|
|
|
|
|
|
@@ -79,7 +79,7 @@ Fixes: 3b0213d56eb7 ("gpio: Add GPIO support for Broadcom STB SoCs")
|
|
|
priv->reg_base = reg_base;
|
|
|
priv->pdev = pdev;
|
|
|
|
|
|
-@@ -655,7 +654,7 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
+@@ -652,7 +651,7 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
dev_dbg(dev, "Width 0 found: Empty bank @ %d\n",
|
|
|
num_banks);
|
|
|
num_banks++;
|
|
|
@@ -88,7 +88,7 @@ Fixes: 3b0213d56eb7 ("gpio: Add GPIO support for Broadcom STB SoCs")
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
-@@ -697,7 +696,7 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
+@@ -694,7 +693,7 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
err = -ENOMEM;
|
|
|
goto fail;
|
|
|
}
|
|
|
@@ -97,7 +97,7 @@ Fixes: 3b0213d56eb7 ("gpio: Add GPIO support for Broadcom STB SoCs")
|
|
|
gc->of_gpio_n_cells = 2;
|
|
|
gc->of_xlate = brcmstb_gpio_of_xlate;
|
|
|
/* not all ngpio lines are valid, will use bank width later */
|
|
|
-@@ -721,7 +720,7 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
+@@ -718,7 +717,7 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
bank->id);
|
|
|
goto fail;
|
|
|
}
|
|
|
@@ -106,7 +106,7 @@ Fixes: 3b0213d56eb7 ("gpio: Add GPIO support for Broadcom STB SoCs")
|
|
|
|
|
|
dev_dbg(dev, "bank=%d, base=%d, ngpio=%d, width=%d\n", bank->id,
|
|
|
gc->base, gc->ngpio, bank->width);
|
|
|
-@@ -732,7 +731,7 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
+@@ -729,7 +728,7 @@ static int brcmstb_gpio_probe(struct pla
|
|
|
num_banks++;
|
|
|
}
|
|
|
|