diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 23:51:53 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-25 09:24:30 +0900 |
| commit | e854547bfa55660e088dffa640e7eaac61833c1a (patch) | |
| tree | 7822d28d11dbe586551a729f3fa97e2010ba9f24 | |
| parent | d9b8f244b909cdff163b012ff7137337f14b4ab8 (diff) | |
sh: Remove unused sh_pfc_register_info() function
All boards use sh_pfc_register() directly, remove the unused
sh_pfc_register_info() function.
Make the name argument to sh_pfc_register() mandatory as it's now
supplied by all callers.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | arch/sh/include/asm/gpio.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/cpu-common/cpu/pfc.h | 4 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/pfc.c | 13 |
3 files changed, 2 insertions, 17 deletions
diff --git a/arch/sh/include/asm/gpio.h b/arch/sh/include/asm/gpio.h index 04f53d31489f..7dfe15e2e990 100644 --- a/arch/sh/include/asm/gpio.h +++ b/arch/sh/include/asm/gpio.h @@ -20,7 +20,7 @@ #endif #define ARCH_NR_GPIOS 512 -#include <linux/sh_pfc.h> +#include <asm-generic/gpio.h> #ifdef CONFIG_GPIOLIB diff --git a/arch/sh/include/cpu-common/cpu/pfc.h b/arch/sh/include/cpu-common/cpu/pfc.h index 40e864360543..e538813286a8 100644 --- a/arch/sh/include/cpu-common/cpu/pfc.h +++ b/arch/sh/include/cpu-common/cpu/pfc.h @@ -18,13 +18,9 @@ #include <linux/types.h> -struct pinmux_info; struct resource; int sh_pfc_register(const char *name, struct resource *resource, u32 num_resources); -int sh_pfc_register_info(const char *name, - struct resource *resource, u32 num_resources, - struct pinmux_info *pdata); #endif /* __ARCH_SH_CPU_PFC_H__ */ diff --git a/arch/sh/kernel/cpu/pfc.c b/arch/sh/kernel/cpu/pfc.c index d045d75c05be..d766564ef7c2 100644 --- a/arch/sh/kernel/cpu/pfc.c +++ b/arch/sh/kernel/cpu/pfc.c @@ -19,26 +19,15 @@ #include <cpu/pfc.h> static struct platform_device sh_pfc_device = { - .name = "sh-pfc", .id = -1, }; int __init sh_pfc_register(const char *name, struct resource *resource, u32 num_resources) { - if (name) - sh_pfc_device.name = name; + sh_pfc_device.name = name; sh_pfc_device.num_resources = num_resources; sh_pfc_device.resource = resource; return platform_device_register(&sh_pfc_device); } - -int __init sh_pfc_register_info(const char *name, - struct resource *resource, u32 num_resources, - struct pinmux_info *pdata) -{ - sh_pfc_device.dev.platform_data = pdata; - - return sh_pfc_register(name, resource, num_resources); -} |