Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 101763
b: refs/heads/master
c: 88b90c9
h: refs/heads/master
i:
  101761: 2c461a4
  101759: 6e09871
v: v3
  • Loading branch information
Geoff Levand authored and Benjamin Herrenschmidt committed Jul 9, 2008
1 parent 45099f8 commit abc6910
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2c3e47871d18f93b8bc2892fb41432111201356d
refs/heads/master: 88b90c96b787ecb5c72384b6873468f814cce650
21 changes: 13 additions & 8 deletions trunk/arch/powerpc/platforms/ps3/system-bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,14 @@ static int ps3_system_bus_match(struct device *_dev,

result = dev->match_id == drv->match_id;

pr_info("%s:%d: dev=%u(%s), drv=%u(%s): %s\n", __func__, __LINE__,
dev->match_id, dev->core.bus_id, drv->match_id, drv->core.name,
(result ? "match" : "miss"));
if (result)
pr_info("%s:%d: dev=%u(%s), drv=%u(%s): match\n", __func__,
__LINE__, dev->match_id, dev->core.bus_id,
drv->match_id, drv->core.name);
else
pr_debug("%s:%d: dev=%u(%s), drv=%u(%s): miss\n", __func__,
__LINE__, dev->match_id, dev->core.bus_id,
drv->match_id, drv->core.name);
return result;
}

Expand All @@ -362,18 +367,18 @@ static int ps3_system_bus_probe(struct device *_dev)
struct ps3_system_bus_driver *drv;

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

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

if (drv->probe)
result = drv->probe(dev);
else
pr_info("%s:%d: %s no probe method\n", __func__, __LINE__,
pr_debug("%s:%d: %s no probe method\n", __func__, __LINE__,
dev->core.bus_id);

pr_info(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);
pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);
return result;
}

Expand All @@ -384,7 +389,7 @@ static int ps3_system_bus_remove(struct device *_dev)
struct ps3_system_bus_driver *drv;

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

drv = ps3_system_bus_dev_to_system_bus_drv(dev);
BUG_ON(!drv);
Expand All @@ -395,7 +400,7 @@ static int ps3_system_bus_remove(struct device *_dev)
dev_dbg(&dev->core, "%s:%d %s: no remove method\n",
__func__, __LINE__, drv->core.name);

pr_info(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);
pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);
return result;
}

Expand Down

0 comments on commit abc6910

Please sign in to comment.