Skip to contentSkip to conversation

ARM: imx: remove #ifdefery for unmerged flexcan driver

PATCH New Uwe Kleine-König 2 participants 2 messages Aug 14, 2010

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Uwe Kleine-König

author
#0 lore raw

PATCH 1/1 ARM: imx: remove #ifdefery for unmerged flexcan driver

The flexcan driver was merged as e955cead.

Cc Sascha Hauer <[email protected]>
Cc Marc Kleine-Budde <[email protected]>
Cc Wolfgang Grandegger <[email protected]>
Signed-off-by Uwe Kleine-K?nig <[email protected]>
---
 arch/arm/plat-mxc/devices/Makefile              |    5 +----
 arch/arm/plat-mxc/include/mach/devices-common.h |   12 ------------
 2 files changed, 1 insertions(+), 16 deletions(-)
arch/arm/plat-mxc/devices/Makefile +1 -4
index 347da51..2062ab4 100644
@@ -1,7 +1,4 @@
-ifdef CONFIG_CAN_FLEXCAN
-# the ifdef can be removed once the flexcan driver has been merged
-obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) +=  platform-flexcan.o
-endif
+obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o
arch/arm/plat-mxc/include/mach/devices-common.h +0 -12
index 1190016..12bdc7d 100644
@@ -14,23 +14,11 @@ struct platform_device *imx_add_platform_device(const char *name, int id,
 		const struct resource *res, unsigned int num_resources,
 		const void *data, size_t size_data);
 
-#if defined (CONFIG_CAN_FLEXCAN) || defined (CONFIG_CAN_FLEXCAN_MODULE)
 #include <linux/can/platform/flexcan.h>
 struct platform_device *__init imx_add_flexcan(int id,
 		resource_size_t iobase, resource_size_t iosize,
 		resource_size_t irq,
 		const struct flexcan_platform_data *pdata);
-#else
-/* the ifdef can be removed once the flexcan driver has been merged */
-struct flexcan_platform_data;
-static inline struct platform_device *__init imx_add_flexcan(int id,
-		resource_size_t iobase, resource_size_t iosize,
-		resource_size_t irq,
-		const struct flexcan_platform_data *pdata)
-{
-	return NULL;
-}
-#endif
 
 #include <mach/i2c.h>
 struct platform_device *__init imx_add_imx_i2c(int id,
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 ARM: imx: remove #ifdefery for unmerged flexcan driver

Quoted 6 lines · Uwe Kleine-K?nig

The flexcan driver was merged as e955cead.

Cc Sascha Hauer <[email protected]>
Cc Marc Kleine-Budde <[email protected]>
Cc Wolfgang Grandegger <[email protected]>
Signed-off-by Uwe Kleine-K?nig <[email protected]>
Acked-by Marc Kleine-Budde <[email protected]>

Cheers, Marc

Quoted 46 lines
---
 arch/arm/plat-mxc/devices/Makefile              |    5 +----
 arch/arm/plat-mxc/include/mach/devices-common.h |   12 ------------
 2 files changed, 1 insertions(+), 16 deletions(-)
arch/arm/plat-mxc/devices/Makefile +1 -4
index 347da51..2062ab4 100644
@@ -1,7 +1,4 @@
-ifdef CONFIG_CAN_FLEXCAN
-# the ifdef can be removed once the flexcan driver has been merged
-obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) +=  platform-flexcan.o
-endif
+obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o
arch/arm/plat-mxc/include/mach/devices-common.h +0 -12
index 1190016..12bdc7d 100644
@@ -14,23 +14,11 @@ struct platform_device *imx_add_platform_device(const char *name, int id,
 		const struct resource *res, unsigned int num_resources,
 		const void *data, size_t size_data);
 
-#if defined (CONFIG_CAN_FLEXCAN) || defined (CONFIG_CAN_FLEXCAN_MODULE)
 #include <linux/can/platform/flexcan.h>
 struct platform_device *__init imx_add_flexcan(int id,
 		resource_size_t iobase, resource_size_t iosize,
 		resource_size_t irq,
 		const struct flexcan_platform_data *pdata);
-#else
-/* the ifdef can be removed once the flexcan driver has been merged */
-struct flexcan_platform_data;
-static inline struct platform_device *__init imx_add_flexcan(int id,
-		resource_size_t iobase, resource_size_t iosize,
-		resource_size_t irq,
-		const struct flexcan_platform_data *pdata)
-{
-	return NULL;
-}
-#endif
 
 #include <mach/i2c.h>
 struct platform_device *__init imx_add_imx_i2c(int id,
Signature · 12 lines
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 260 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100814/5262b4da/attachment.sig>