1 files changed, 17 insertions, 14 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 3f940393d6c7..66b710c28812 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);
                 }
         }