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>

diff --git a/arch/sh/include/asm/gpio.h b/arch/sh/include/asm/gpio.h
index 04f53d31489f2cc142f804bd444593305db27c01..7dfe15e2e990b5fd11ffab3945ddd5eed46923b3 100644 (file)
--- 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 40e864360543273eaa26465c64fd0b01651f315d..e538813286a87463244a88ec0815196e4b96d029 100644 (file)
--- 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 d045d75c05bec2f548e802791676b65b05a797d6..d766564ef7c2da5ac743197116666fa27e3eb9f4 100644 (file)
--- 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);
-}