2009-01-26 17:36:41

by Greg KH

Subject: PS3: replace bus_id usage

From: Greg Kroah-Hartman <[email protected]>

These simple debug statments should be using dev_dbg() instead of
accessing bus_id directly (or they should use device_name).

As bus_id is going away, this patch is necessary.

Cc: Geoff Levand <[email protected]>
Cc: Kay Sievers <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---

This fixes a built-breakage in linux-next. I'll be glad to keep this in
my tree if you don't want to take it in yours, just let me know.

arch/powerpc/platforms/ps3/system-bus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -376,7 +376,7 @@ static int ps3_system_bus_probe(struct d
struct ps3_system_bus_driver *drv;

BUG_ON(!dev);
- pr_debug(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);
+ dev_dbg(_dev, "%s:%d\n", __func__, __LINE__);

drv = ps3_system_bus_dev_to_system_bus_drv(dev);
BUG_ON(!drv);
@@ -398,7 +398,7 @@ static int ps3_system_bus_remove(struct
struct ps3_system_bus_driver *drv;

BUG_ON(!dev);
- pr_debug(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);
+ dev_dbg(_dev, "%s:%d\n", __func__, __LINE__);

drv = ps3_system_bus_dev_to_system_bus_drv(dev);
BUG_ON(!drv);

2009-01-30 00:00:49

by Geoff Levand

Subject: Re: PS3: replace bus_id usage

Greg KH wrote:
> From: Greg Kroah-Hartman <[email protected]>
>
> These simple debug statments should be using dev_dbg() instead of
> accessing bus_id directly (or they should use device_name).
>
> As bus_id is going away, this patch is necessary.
>
> Cc: Geoff Levand <[email protected]>
> Cc: Kay Sievers <[email protected]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
>
> ---
>
> This fixes a built-breakage in linux-next. I'll be glad to keep this in
> my tree if you don't want to take it in yours, just let me know.
>
> arch/powerpc/platforms/ps3/system-bus.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

This looks OK. Greg, please merge it through your tree.

Acked-by: Geoff Levand <[email protected]>