Commit 56dc04af authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman

sh-pfc: Remove unused resource and num_resources platform data fields

The fields are now unused, remove them.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 8682b3c5
...@@ -28,31 +28,22 @@ ...@@ -28,31 +28,22 @@
static int sh_pfc_ioremap(struct sh_pfc *pfc, struct platform_device *pdev) static int sh_pfc_ioremap(struct sh_pfc *pfc, struct platform_device *pdev)
{ {
unsigned int num_resources;
struct resource *res; struct resource *res;
int k; int k;
if (pdev->num_resources) { if (pdev->num_resources == 0) {
num_resources = pdev->num_resources;
res = pdev->resource;
} else {
num_resources = pfc->pdata->num_resources;
res = pfc->pdata->resource;
}
if (num_resources == 0) {
pfc->num_windows = 0; pfc->num_windows = 0;
return 0; return 0;
} }
pfc->window = devm_kzalloc(pfc->dev, num_resources * pfc->window = devm_kzalloc(pfc->dev, pdev->num_resources *
sizeof(*pfc->window), GFP_NOWAIT); sizeof(*pfc->window), GFP_NOWAIT);
if (!pfc->window) if (!pfc->window)
return -ENOMEM; return -ENOMEM;
pfc->num_windows = num_resources; pfc->num_windows = pdev->num_resources;
for (k = 0; k < num_resources; k++, res++) { for (k = 0, res = pdev->resource; k < pdev->num_resources; k++, res++) {
WARN_ON(resource_type(res) != IORESOURCE_MEM); WARN_ON(resource_type(res) != IORESOURCE_MEM);
pfc->window[k].phys = res->start; pfc->window[k].phys = res->start;
pfc->window[k].size = resource_size(res); pfc->window[k].size = resource_size(res);
......
...@@ -111,9 +111,6 @@ struct sh_pfc_platform_data { ...@@ -111,9 +111,6 @@ struct sh_pfc_platform_data {
struct pinmux_irq *gpio_irq; struct pinmux_irq *gpio_irq;
unsigned int gpio_irq_size; unsigned int gpio_irq_size;
struct resource *resource;
unsigned int num_resources;
unsigned long unlock_reg; unsigned long unlock_reg;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment