4 files changed, 30 insertions, 34 deletions

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 6318f6b57360..d8e8c49c0cbd 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -54,7 +54,7 @@ config FIRMWARE_IN_KERNEL
           such firmware, and do not wish to use an initrd.
 
           This single option controls the inclusion of firmware for
-          every driver which usees request_firmare() and ships its
+          every driver which uses request_firmare() and ships its
           firmware in the kernel source tree, to avoid a proliferation
           of 'Include firmware for xxx device' options.
 
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index c9c92b00fd55..b7e571031ecd 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -164,8 +164,7 @@ static ssize_t firmware_loading_store(struct device *dev,
                 }
                 /* fallthrough */
         default:
-                printk(KERN_ERR "%s: unexpected value (%d)\n", __func__,
-                       loading);
+                dev_err(dev, "%s: unexpected value (%d)\n", __func__, loading);
                 /* fallthrough */
         case -1:
                 fw_load_abort(fw_priv);
@@ -309,7 +308,7 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,
         *dev_p = NULL;
 
         if (!fw_priv || !f_dev) {
-                printk(KERN_ERR "%s: kmalloc failed\n", __func__);
+                dev_err(device, "%s: kmalloc failed\n", __func__);
                 retval = -ENOMEM;
                 goto error_kfree;
         }
@@ -329,8 +328,7 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,
         f_dev->uevent_suppress = 1;
         retval = device_register(f_dev);
         if (retval) {
-                printk(KERN_ERR "%s: device_register failed\n",
-                       __func__);
+                dev_err(device, "%s: device_register failed\n", __func__);
                 goto error_kfree;
         }
         *dev_p = f_dev;
@@ -363,15 +361,13 @@ static int fw_setup_device(struct firmware *fw, struct device **dev_p,
         fw_priv->fw = fw;
         retval = sysfs_create_bin_file(&f_dev->kobj, &fw_priv->attr_data);
         if (retval) {
-                printk(KERN_ERR "%s: sysfs_create_bin_file failed\n",
-                       __func__);
+                dev_err(device, "%s: sysfs_create_bin_file failed\n", __func__);
                 goto error_unreg;
         }
 
         retval = device_create_file(f_dev, &dev_attr_loading);
         if (retval) {
-                printk(KERN_ERR "%s: device_create_file failed\n",
-                       __func__);
+                dev_err(device, "%s: device_create_file failed\n", __func__);
                 goto error_unreg;
         }
 
@@ -401,8 +397,8 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
 
         *firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL);
         if (!firmware) {
-                printk(KERN_ERR "%s: kmalloc(struct firmware) failed\n",
-                       __func__);
+                dev_err(device, "%s: kmalloc(struct firmware) failed\n",
+                        __func__);
                 retval = -ENOMEM;
                 goto out;
         }
@@ -411,15 +407,15 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
              builtin++) {
                 if (strcmp(name, builtin->name))
                         continue;
-                printk(KERN_INFO "firmware: using built-in firmware %s\n",
-                       name);
+                dev_info(device, "firmware: using built-in firmware %s\n",
+                         name);
                 firmware->size = builtin->size;
                 firmware->data = builtin->data;
                 return 0;
         }
 
         if (uevent)
-                printk(KERN_INFO "firmware: requesting %s\n", name);
+                dev_info(device, "firmware: requesting %s\n", name);
 
         retval = fw_setup_device(firmware, &f_dev, name, device, uevent);
         if (retval)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 9e60f7c739c6..dfcbfe504867 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -42,10 +42,8 @@ struct resource *platform_get_resource(struct platform_device *dev,
         for (i = 0; i < dev->num_resources; i++) {
                 struct resource *r = &dev->resource[i];
 
-                if ((r->flags & (IORESOURCE_IO|IORESOURCE_MEM|
-                                 IORESOURCE_IRQ|IORESOURCE_DMA)) == type)
-                        if (num-- == 0)
-                                return r;
+                if (type == resource_type(r) && num-- == 0)
+                        return r;
         }
         return NULL;
 }
@@ -78,10 +76,8 @@ struct resource *platform_get_resource_byname(struct platform_device *dev,
         for (i = 0; i < dev->num_resources; i++) {
                 struct resource *r = &dev->resource[i];
 
-                if ((r->flags & (IORESOURCE_IO|IORESOURCE_MEM|
-                                 IORESOURCE_IRQ|IORESOURCE_DMA)) == type)
-                        if (!strcmp(r->name, name))
-                                return r;
+                if (type == resource_type(r) && !strcmp(r->name, name))
+                        return r;
         }
         return NULL;
 }
@@ -259,9 +255,9 @@ int platform_device_add(struct platform_device *pdev)
 
                 p = r->parent;
                 if (!p) {
-                        if (r->flags & IORESOURCE_MEM)
+                        if (resource_type(r) == IORESOURCE_MEM)
                                 p = &iomem_resource;
-                        else if (r->flags & IORESOURCE_IO)
+                        else if (resource_type(r) == IORESOURCE_IO)
                                 p = &ioport_resource;
                 }
 
@@ -282,9 +278,14 @@ int platform_device_add(struct platform_device *pdev)
                 return ret;
 
  failed:
-        while (--i >= 0)
-                if (pdev->resource[i].flags & (IORESOURCE_MEM|IORESOURCE_IO))
-                        release_resource(&pdev->resource[i]);
+        while (--i >= 0) {
+                struct resource *r = &pdev->resource[i];
+                unsigned long type = resource_type(r);
+
+                if (type == IORESOURCE_MEM || type == IORESOURCE_IO)
+                        release_resource(r);
+        }
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(platform_device_add);
@@ -306,7 +307,9 @@ void platform_device_del(struct platform_device *pdev)
 
                 for (i = 0; i < pdev->num_resources; i++) {
                         struct resource *r = &pdev->resource[i];
-                        if (r->flags & (IORESOURCE_MEM|IORESOURCE_IO))
+                        unsigned long type = resource_type(r);
+
+                        if (type == IORESOURCE_MEM || type == IORESOURCE_IO)
                                 release_resource(r);
                 }
         }
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index b0eb6afdd861..692c20ba5144 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -778,10 +778,7 @@ EXPORT_SYMBOL_GPL(device_suspend);
 
 void __suspend_report_result(const char *function, void *fn, int ret)
 {
-        if (ret) {
-                printk(KERN_ERR "%s(): ", function);
-                print_fn_descriptor_symbol("%s returns ", fn);
-                printk("%d\n", ret);
-        }
+        if (ret)
+                printk(KERN_ERR "%s(): %pF returns %d\n", function, fn, ret);
 }
 EXPORT_SYMBOL_GPL(__suspend_report_result);