@@ -20,7 +20,7 @@
#endif
#define ARCH_NR_GPIOS 512
-#include <linux/sh_pfc.h>
+#include <asm-generic/gpio.h>
#ifdef CONFIG_GPIOLIB
@@ -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__ */
@@ -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);
-}
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> --- arch/sh/include/asm/gpio.h | 2 +- arch/sh/include/cpu-common/cpu/pfc.h | 4 ---- arch/sh/kernel/cpu/pfc.c | 13 +------------ 3 files changed, 2 insertions(+), 17 deletions(-)