Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 75840
b: refs/heads/master
c: 7dc72b2
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jan 25, 2008
1 parent 21843c0 commit 82a455d
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e5dd12784617f0f1fae5f96a7fac1ec4c49fadbe
refs/heads/master: 7dc72b2842381684b864750af31a5fb168dec764
14 changes: 7 additions & 7 deletions trunk/drivers/base/bus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static void driver_release(struct kobject *kobj)
{
struct driver_private *drv_priv = to_driver(kobj);

pr_debug("%s: freeing %s\n", __FUNCTION__, kobject_name(kobj));
pr_debug("driver: '%s': %s\n", kobject_name(kobj), __FUNCTION__);
kfree(drv_priv);
}

Expand Down Expand Up @@ -446,7 +446,7 @@ int bus_add_device(struct device * dev)
int error = 0;

if (bus) {
pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id);
pr_debug("bus: '%s': add device %s\n", bus->name, dev->bus_id);
error = device_add_attrs(bus, dev);
if (error)
goto out_put;
Expand Down Expand Up @@ -519,7 +519,7 @@ void bus_remove_device(struct device * dev)
dev->is_registered = 0;
klist_del(&dev->knode_bus);
}
pr_debug("bus %s: remove device %s\n", dev->bus->name, dev->bus_id);
pr_debug("bus: '%s': remove device %s\n", dev->bus->name, dev->bus_id);
device_release_driver(dev);
bus_put(dev->bus);
}
Expand Down Expand Up @@ -637,7 +637,7 @@ int bus_add_driver(struct device_driver *drv)
if (!bus)
return -EINVAL;

pr_debug("bus %s: add driver %s\n", bus->name, drv->name);
pr_debug("bus: '%s': add driver %s\n", bus->name, drv->name);

priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv)
Expand Down Expand Up @@ -707,7 +707,7 @@ void bus_remove_driver(struct device_driver * drv)
driver_remove_attrs(drv->bus, drv);
driver_remove_file(drv, &driver_attr_uevent);
klist_remove(&drv->p->knode_bus);
pr_debug("bus %s: remove driver %s\n", drv->bus->name, drv->name);
pr_debug("bus: '%s': remove driver %s\n", drv->bus->name, drv->name);
driver_detach(drv);
module_remove_driver(drv);
kobject_unregister(&drv->p->kobj);
Expand Down Expand Up @@ -907,7 +907,7 @@ int bus_register(struct bus_type * bus)
if (retval)
goto bus_attrs_fail;

pr_debug("bus type '%s' registered\n", bus->name);
pr_debug("bus: '%s': registered\n", bus->name);
return 0;

bus_attrs_fail:
Expand All @@ -934,7 +934,7 @@ int bus_register(struct bus_type * bus)
*/
void bus_unregister(struct bus_type * bus)
{
pr_debug("bus %s: unregistering\n", bus->name);
pr_debug("bus: '%s': unregistering\n", bus->name);
bus_remove_attrs(bus);
remove_probe_files(bus);
kset_unregister(bus->p->drivers_kset);
Expand Down
23 changes: 13 additions & 10 deletions trunk/drivers/base/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,23 +193,25 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj,
if (dev->bus && dev->bus->uevent) {
retval = dev->bus->uevent(dev, env);
if (retval)
pr_debug ("%s: bus uevent() returned %d\n",
__FUNCTION__, retval);
pr_debug("device: '%s': %s: bus uevent() returned %d\n",
dev->bus_id, __FUNCTION__, retval);
}

/* have the class specific function add its stuff */
if (dev->class && dev->class->dev_uevent) {
retval = dev->class->dev_uevent(dev, env);
if (retval)
pr_debug("%s: class uevent() returned %d\n",
pr_debug("device: '%s': %s: class uevent() "
"returned %d\n", dev->bus_id,
__FUNCTION__, retval);
}

/* have the device type specific fuction add its stuff */
if (dev->type && dev->type->uevent) {
retval = dev->type->uevent(dev, env);
if (retval)
pr_debug("%s: dev_type uevent() returned %d\n",
pr_debug("device: '%s': %s: dev_type uevent() "
"returned %d\n", dev->bus_id,
__FUNCTION__, retval);
}

Expand Down Expand Up @@ -751,7 +753,7 @@ int device_add(struct device *dev)
goto Error;
}

pr_debug("DEV: registering device: ID = '%s'\n", dev->bus_id);
pr_debug("device: '%s': %s\n", dev->bus_id, __FUNCTION__);

parent = get_device(dev->parent);
error = setup_parent(dev, parent);
Expand Down Expand Up @@ -1020,7 +1022,7 @@ void device_del(struct device * dev)
*/
void device_unregister(struct device * dev)
{
pr_debug("DEV: Unregistering device. ID = '%s'\n", dev->bus_id);
pr_debug("device: '%s': %s\n", dev->bus_id, __FUNCTION__);
device_del(dev);
put_device(dev);
}
Expand Down Expand Up @@ -1116,7 +1118,7 @@ EXPORT_SYMBOL_GPL(device_remove_file);

static void device_create_release(struct device *dev)
{
pr_debug("%s called for %s\n", __FUNCTION__, dev->bus_id);
pr_debug("device: '%s': %s\n", dev->bus_id, __FUNCTION__);
kfree(dev);
}

Expand Down Expand Up @@ -1259,7 +1261,8 @@ int device_rename(struct device *dev, char *new_name)
if (!dev)
return -EINVAL;

pr_debug("DEVICE: renaming '%s' to '%s'\n", dev->bus_id, new_name);
pr_debug("device: '%s': %s: renaming to '%s'\n", dev->bus_id,
__FUNCTION__, new_name);

#ifdef CONFIG_SYSFS_DEPRECATED
if ((dev->class) && (dev->parent))
Expand Down Expand Up @@ -1378,8 +1381,8 @@ int device_move(struct device *dev, struct device *new_parent)
put_device(new_parent);
goto out;
}
pr_debug("DEVICE: moving '%s' to '%s'\n", dev->bus_id,
new_parent ? new_parent->bus_id : "<NULL>");
pr_debug("device: '%s': %s: moving to '%s'\n", dev->bus_id,
__FUNCTION__, new_parent ? new_parent->bus_id : "<NULL>");
error = kobject_move(&dev->kobj, new_parent_kobj);
if (error) {
put_device(new_parent);
Expand Down
16 changes: 8 additions & 8 deletions trunk/drivers/base/dd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ static void driver_bound(struct device *dev)
return;
}

pr_debug("bound device '%s' to driver '%s'\n",
dev->bus_id, dev->driver->name);
pr_debug("driver: '%s': %s: bound to device '%s'\n", dev->bus_id,
__FUNCTION__, dev->driver->name);

if (dev->bus)
blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
Expand Down Expand Up @@ -102,8 +102,8 @@ static int really_probe(struct device *dev, struct device_driver *drv)
int ret = 0;

atomic_inc(&probe_count);
pr_debug("%s: Probing driver %s with device %s\n",
drv->bus->name, drv->name, dev->bus_id);
pr_debug("bus: '%s': %s: probing driver %s with device %s\n",
drv->bus->name, __FUNCTION__, drv->name, dev->bus_id);
WARN_ON(!list_empty(&dev->devres_head));

dev->driver = drv;
Expand All @@ -125,8 +125,8 @@ static int really_probe(struct device *dev, struct device_driver *drv)

driver_bound(dev);
ret = 1;
pr_debug("%s: Bound Device %s to Driver %s\n",
drv->bus->name, dev->bus_id, drv->name);
pr_debug("bus: '%s': %s: bound device %s to driver %s\n",
drv->bus->name, __FUNCTION__, dev->bus_id, drv->name);
goto done;

probe_failed:
Expand Down Expand Up @@ -192,8 +192,8 @@ int driver_probe_device(struct device_driver * drv, struct device * dev)
if (drv->bus->match && !drv->bus->match(dev, drv))
goto done;

pr_debug("%s: Matched Device %s with Driver %s\n",
drv->bus->name, dev->bus_id, drv->name);
pr_debug("bus: '%s': %s: matched device %s with driver %s\n",
drv->bus->name, __FUNCTION__, dev->bus_id, drv->name);

ret = really_probe(dev, drv);

Expand Down

0 comments on commit 82a455d

Please sign in to comment.