[PATCH 14/42] sh-pfc: Remove unused resource and num_resources platform data fields

Laurent Pinchart
2012-11-21T02:34:44Z

The fields are now unused, remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
drivers/sh/pfc/core.c | 17 ++++-------------
include/linux/sh_pfc.h | 3 ---
2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/drivers/sh/pfc/core.c b/drivers/sh/pfc/core.c
index eeec76f..68b40d8 100644
--- a/drivers/sh/pfc/core.c
+++ b/drivers/sh/pfc/core.c
@@ -41,31 +41,22 @@ static void pfc_iounmap(struct sh_pfc *pfc)

static int pfc_ioremap(struct sh_pfc *pfc, struct platform_device *pdev)
{
- unsigned int num_resources;
struct resource *res;
int k;

- if (pdev->num_resources) {
- num_resources = pdev->num_resources;
- res = pdev->resource;
- } else {
- num_resources = pfc->pdata->num_resources;
- res = pfc->pdata->resource;
- }
-
- if (num_resources == 0) {
+ if (pdev->num_resources == 0) {
pfc->num_windows = 0;
return 0;
}

- pfc->window = kzalloc(num_resources * sizeof(*pfc->window),
+ pfc->window = kzalloc(pdev->num_resources * sizeof(*pfc->window),
GFP_NOWAIT);
if (!pfc->window)
goto err1;

- 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);
pfc->window[k].phys = res->start;
pfc->window[k].size = resource_size(res);
diff --git a/include/linux/sh_pfc.h b/include/linux/sh_pfc.h
index fa1fec0..4f94233 100644
--- a/include/linux/sh_pfc.h
+++ b/include/linux/sh_pfc.h
@@ -111,9 +111,6 @@ struct sh_pfc_platform_data {
struct pinmux_irq *gpio_irq;
unsigned int gpio_irq_size;

- struct resource *resource;
- unsigned int num_resources;
-
unsigned long unlock_reg;
};

--
1.7.8.6