X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=drivers%2Facpi%2Fglue.c;h=084109507c9f5101a1cdcf678db34005984a2855;hb=04489eeb02a40bc15029886cef7285ada3ab0de6;hp=0f2dd81736bda796c8ace56f1f216edca65f88fd;hpb=2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b;p=linux-2.6

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 0f2dd81736..084109507c 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -146,8 +146,7 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
 	acpi_status status;
 
 	if (dev->archdata.acpi_handle) {
-		printk(KERN_WARNING PREFIX
-		       "Drivers changed 'acpi_handle' for %s\n", dev->bus_id);
+		dev_warn(dev, "Drivers changed 'acpi_handle'\n");
 		return -EINVAL;
 	}
 	get_device(dev);
@@ -195,8 +194,7 @@ static int acpi_unbind_one(struct device *dev)
 		/* acpi_bind_one increase refcnt by one */
 		put_device(dev);
 	} else {
-		printk(KERN_ERR PREFIX
-		       "Oops, 'acpi_handle' corrupt for %s\n", dev->bus_id);
+		dev_err(dev, "Oops, 'acpi_handle' corrupt\n");
 	}
 	return 0;
 }
@@ -335,9 +333,6 @@ static int __init acpi_rtc_init(void)
 {
 	struct device *dev = get_rtc_dev();
 
-	if (acpi_disabled)
-		return 0;
-
 	if (acpi_disabled)
 		return 0;