Commit 738d5ad1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "of/platform: Add stubs for of_platform_device_create/destroy()" 

This reverts commit 412981e0 as the
patch series is causing build issues in linux-next at the moment.

Cc: Matthias Kaehlcke <mka@chromium.org>
Link: https://lore.kernel.org/r/YMuRcrE8xlWnFSWW@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 70b8edf9

include/linux/of_platform.h

+4 −18
Original line number Original line Diff line number Diff line
@@ -61,18 +61,16 @@ static inline struct platform_device *of_find_device_by_node(struct device_node 
}

}

#endif

#endif





extern int of_platform_bus_probe(struct device_node *root,

				 const struct of_device_id *matches,

				 struct device *parent);



#ifdef CONFIG_OF_ADDRESS

/* Platform devices and busses creation */

/* Platform devices and busses creation */

extern struct platform_device *of_platform_device_create(struct device_node *np,

extern struct platform_device *of_platform_device_create(struct device_node *np,

						   const char *bus_id,

						   const char *bus_id,

						   struct device *parent);

						   struct device *parent);





extern int of_platform_device_destroy(struct device *dev, void *data);

extern int of_platform_device_destroy(struct device *dev, void *data);



extern int of_platform_bus_probe(struct device_node *root,

				 const struct of_device_id *matches,

				 struct device *parent);

#ifdef CONFIG_OF_ADDRESS

extern int of_platform_populate(struct device_node *root,

extern int of_platform_populate(struct device_node *root,

				const struct of_device_id *matches,

				const struct of_device_id *matches,

				const struct of_dev_auxdata *lookup,

				const struct of_dev_auxdata *lookup,
@@ -86,18 +84,6 @@ extern int devm_of_platform_populate(struct device *dev); 




extern void devm_of_platform_depopulate(struct device *dev);

extern void devm_of_platform_depopulate(struct device *dev);

#else

#else

/* Platform devices and busses creation */

static inline struct platform_device *of_platform_device_create(struct device_node *np,

								const char *bus_id,

								struct device *parent)

{

	return NULL;

}

static inline int of_platform_device_destroy(struct device *dev, void *data)

{

	return -ENODEV;

}



static inline int of_platform_populate(struct device_node *root,

static inline int of_platform_populate(struct device_node *root,

					const struct of_device_id *matches,

					const struct of_device_id *matches,

					const struct of_dev_auxdata *lookup,

					const struct of_dev_auxdata *lookup,