Merge branch 'fix/asoc' into for-linus

[pandora-kernel.git] / drivers / uwb / umc-dev.c

diff --git a/drivers/uwb/umc-dev.c b/drivers/uwb/umc-dev.c
index aa44e1c..1fc7d82 100644 (file)
--- a/drivers/uwb/umc-dev.c
+++ b/drivers/uwb/umc-dev.c
@@ -7,8 +7,6 @@
  */
 #include <linux/kernel.h>
 #include <linux/uwb/umc.h>
-#define D_LOCAL 0
-#include <linux/uwb/debug.h>
 
 static void umc_device_release(struct device *dev)
 {
@@ -31,8 +29,7 @@ struct umc_dev *umc_device_create(struct device *parent, int n)
 
        umc = kzalloc(sizeof(struct umc_dev), GFP_KERNEL);
        if (umc) {
-               snprintf(umc->dev.bus_id, sizeof(umc->dev.bus_id), "%s-%d",
-                        parent->bus_id, n);
+               dev_set_name(&umc->dev, "%s-%d", dev_name(parent), n);
                umc->dev.parent  = parent;
                umc->dev.bus     = &umc_bus_type;
                umc->dev.release = umc_device_release;
@@ -54,8 +51,6 @@ int umc_device_register(struct umc_dev *umc)
 {
        int err;
 
-       d_fnstart(3, &umc->dev, "(umc_dev %p)\n", umc);
-
        err = request_resource(umc->resource.parent, &umc->resource);
        if (err < 0) {
                dev_err(&umc->dev, "can't allocate resource range "
@@ -69,13 +64,11 @@ int umc_device_register(struct umc_dev *umc)
        err = device_register(&umc->dev);
        if (err < 0)
                goto error_device_register;
-       d_fnend(3, &umc->dev, "(umc_dev %p) = 0\n", umc);
        return 0;
 
 error_device_register:
        release_resource(&umc->resource);
 error_request_resource:
-       d_fnend(3, &umc->dev, "(umc_dev %p) = %d\n", umc, err);
        return err;
 }
 EXPORT_SYMBOL_GPL(umc_device_register);
@@ -95,10 +88,8 @@ void umc_device_unregister(struct umc_dev *umc)
        if (!umc)
                return;
        dev = get_device(&umc->dev);
-       d_fnstart(3, dev, "(umc_dev %p)\n", umc);
        device_unregister(&umc->dev);
        release_resource(&umc->resource);
-       d_fnend(3, dev, "(umc_dev %p) = void\n", umc);
        put_device(dev);
 }
 EXPORT_SYMBOL_GPL(umc_device_unregister);