[PATCH] of/device: Make of_device_make_bus_id() usable by other code.

[PATCH] of/device: Make of_device_make_bus_id() usable by other code.

[Grant Likely]

The AMBA bus should also use of_device_make_bus_id() when populating device
out of device tree data.  This patch makes the function non-static, and
adds a suitable prototype in of_device.h

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
 drivers/of/platform.c     |    2 +-
 include/linux/of_device.h |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 94fa719..600d77f 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -508,7 +508,7 @@ EXPORT_SYMBOL(of_unregister_driver);
  * value to derive a unique name.  As a last resort it will use the node
  * name followed by a unique number.
  */
-static void of_device_make_bus_id(struct device *dev)
+void of_device_make_bus_id(struct device *dev)
 {
 	static atomic_t bus_no_reg_magic;
 	struct device_node *node = dev->of_node;
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index e11a0be..249bc11 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -27,6 +27,9 @@
 
 extern const struct of_device_id *of_match_device(
 	const struct of_device_id *matches, const struct device *dev);
+#if !defined(CONFIG_SPARC)
+extern void of_device_make_bus_id(struct device *dev);
+#endif
 
 /**
  * of_driver_match_device - Tell if a driver's of_match_table matches a device.

Re: [PATCH] of/device: Make of_device_make_bus_id() usable by other code.

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 729 bytes --]

Hi Grant,

On Sat, 24 Jul 2010 10:01:11 -0600 Grant Likely <grant.likely@secretlab.ca> wrote:
>
> diff --git a/include/linux/of_device.h b/include/linux/of_device.h
> index e11a0be..249bc11 100644
> --- a/include/linux/of_device.h
> +++ b/include/linux/of_device.h
> @@ -27,6 +27,9 @@
>  
>  extern const struct of_device_id *of_match_device(
>  	const struct of_device_id *matches, const struct device *dev);
> +#if !defined(CONFIG_SPARC)
> +extern void of_device_make_bus_id(struct device *dev);
> +#endif

You don't really need the protection here - it does not clash with
anything on SPARC, right?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: [PATCH] of/device: Make of_device_make_bus_id() usable by other code.

[Grant Likely]

On Sat, Jul 24, 2010 at 9:34 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Grant,
>
> On Sat, 24 Jul 2010 10:01:11 -0600 Grant Likely <grant.likely@secretlab.ca> wrote:
>>
>> diff --git a/include/linux/of_device.h b/include/linux/of_device.h
>> index e11a0be..249bc11 100644
>> --- a/include/linux/of_device.h
>> +++ b/include/linux/of_device.h
>> @@ -27,6 +27,9 @@
>>
>>  extern const struct of_device_id *of_match_device(
>>       const struct of_device_id *matches, const struct device *dev);
>> +#if !defined(CONFIG_SPARC)
>> +extern void of_device_make_bus_id(struct device *dev);
>> +#endif
>
> You don't really need the protection here - it does not clash with
> anything on SPARC, right?

No, it doesn't conflict with anything.  I'll drop the if !defined() wrapper.

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.