From 3f496397b0b26cd13960bf1ba836d312beeb9fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Mon, 1 Aug 2011 10:51:00 +0200 Subject: [PATCH] --- yaml --- r: 272530 b: refs/heads/master c: 160a84cfc975f4aaec1cb32a48bba23ccaf43761 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/devices.c | 14 -------------- trunk/arch/arm/plat-mxc/include/mach/common.h | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/[refs] b/[refs] index a28ca209c7b4..7243d8ec79ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47ccfc340aa83e0741d9cabd7f5a3e74659a411d +refs/heads/master: 160a84cfc975f4aaec1cb32a48bba23ccaf43761 diff --git a/trunk/arch/arm/plat-mxc/devices.c b/trunk/arch/arm/plat-mxc/devices.c index 0d6ed31bdbf2..5aaa8c5f3420 100644 --- a/trunk/arch/arm/plat-mxc/devices.c +++ b/trunk/arch/arm/plat-mxc/devices.c @@ -23,20 +23,6 @@ #include #include -int __init mxc_register_device(struct platform_device *pdev, void *data) -{ - int ret; - - pdev->dev.platform_data = data; - - ret = platform_device_register(pdev); - if (ret) - pr_debug("Unable to register platform device '%s': %d\n", - pdev->name, ret); - - return ret; -} - struct platform_device *__init imx_add_platform_device_dmamask( const char *name, int id, const struct resource *res, unsigned int num_resources, diff --git a/trunk/arch/arm/plat-mxc/include/mach/common.h b/trunk/arch/arm/plat-mxc/include/mach/common.h index 4e3d97890d69..91d810cef6fa 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/common.h +++ b/trunk/arch/arm/plat-mxc/include/mach/common.h @@ -66,7 +66,6 @@ extern int mx53_clocks_init(unsigned long ckil, unsigned long osc, unsigned long ckih1, unsigned long ckih2); extern struct platform_device *mxc_register_gpio(char *name, int id, resource_size_t iobase, resource_size_t iosize, int irq, int irq_high); -extern int mxc_register_device(struct platform_device *pdev, void *data); extern void mxc_set_cpu_type(unsigned int type); extern void mxc_arch_reset_init(void __iomem *); extern void mx51_efikamx_reset(void);