linux-next: manual merge of the driver-core tree with thedevicetree tree

From: Stephen Rothwell
Date: Mon Jun 17 2013 - 01:33:12 EST

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
include/linux/platform_device.h between commit 10dbc5e39a60 ("driver
core: move to_platform_driver to platform_device.h") from the devicetree
tree and commit 9447057eaff8 ("platform_device: use a macro instead of
platform_driver_register") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc include/linux/platform_device.h
index 3413897,cd46ee5..0000000
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@@ -180,10 -180,13 +180,16 @@@ struct platform_driver
const struct platform_device_id *id_table;

+#define to_platform_driver(drv) (container_of((drv), struct platform_driver, \
+ driver))
- extern int platform_driver_register(struct platform_driver *);
+ /*
+ * use a macro to avoid include chaining to get THIS_MODULE
+ */
+ #define platform_driver_register(drv) \
+ __platform_driver_register(drv, THIS_MODULE)
+ extern int __platform_driver_register(struct platform_driver *,
+ struct module *);
extern void platform_driver_unregister(struct platform_driver *);

/* non-hotpluggable platform devices may use this so that probe() and

Attachment: pgp00000.pgp
Description: PGP signature