Skip to content

Commit

Permalink
sh-pfc: Remove unused resource and num_resources platform data fields
Browse files Browse the repository at this point in the history
The fields are now unused, remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  • Loading branch information
Laurent Pinchart authored and horms committed Jan 25, 2013
1 parent 8682b3c commit 56dc04a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
17 changes: 4 additions & 13 deletions drivers/sh/pfc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,22 @@

static int sh_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 = devm_kzalloc(pfc->dev, num_resources *
pfc->window = devm_kzalloc(pfc->dev, pdev->num_resources *
sizeof(*pfc->window), GFP_NOWAIT);
if (!pfc->window)
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);
pfc->window[k].phys = res->start;
pfc->window[k].size = resource_size(res);
Expand Down
3 changes: 0 additions & 3 deletions include/linux/sh_pfc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand Down

0 comments on commit 56dc04a

Please sign in to comment.