resource/PCI: align functions now return start of resource

As suggested by Linus, align functions should return the start
of a resource, not void. An update of "res->start" is no longer
necessary.

Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

3 files changed, 19 insertions, 15 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index cef28a79103f..d29d69a37940 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -36,8 +36,10 @@ int
 pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
                 resource_size_t size, resource_size_t align,
                 resource_size_t min, unsigned int type_mask,
-                void (*alignf)(void *, struct resource *, resource_size_t,
-                                resource_size_t),
+                resource_size_t (*alignf)(void *,
+                                          struct resource *,
+                                          resource_size_t,
+                                          resource_size_t),
                 void *alignf_data)
 {
         int i, ret = -ENOMEM;
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index 52db17263d8b..f92a2dac13a2 100644
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -114,22 +114,20 @@ struct pcmcia_align_data {
         unsigned long   offset;
 };
 
-static void pcmcia_align(void *align_data, struct resource *res,
-                        unsigned long size, unsigned long align)
+static resource_size_t pcmcia_align(void *align_data, struct resource *res,
+                                resource_size_t size, resource_size_t align)
 {
         struct pcmcia_align_data *data = align_data;
-        unsigned long start;
+        resource_size_t start;
 
         start = (res->start & ~data->mask) + data->offset;
         if (start < res->start)
                 start += data->mask + 1;
-        res->start = start;
 
 #ifdef CONFIG_X86
         if (res->flags & IORESOURCE_IO) {
                 if (start & 0x300) {
                         start = (start + 0x3ff) & ~0x3ff;
-                        res->start = start;
                 }
         }
 #endif
@@ -137,9 +135,11 @@ static void pcmcia_align(void *align_data, struct resource *res,
 #ifdef CONFIG_M68K
         if (res->flags & IORESOURCE_IO) {
                 if ((res->start + size - 1) >= 1024)
-                        res->start = res->end;
+                        start = res->end;
         }
 #endif
+
+        return start;
 }
 
 
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 9b0dc433a8c3..b65902870e44 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -533,7 +533,7 @@ struct pcmcia_align_data {
         struct resource_map     *map;
 };
 
-static void
+static resource_size_t
 pcmcia_common_align(void *align_data, struct resource *res,
                         resource_size_t size, resource_size_t align)
 {
@@ -545,17 +545,18 @@ pcmcia_common_align(void *align_data, struct resource *res,
         start = (res->start & ~data->mask) + data->offset;
         if (start < res->start)
                 start += data->mask + 1;
-        res->start = start;
+        return start;
 }
 
-static void
+static resource_size_t
 pcmcia_align(void *align_data, struct resource *res, resource_size_t size,
                 resource_size_t align)
 {
         struct pcmcia_align_data *data = align_data;
         struct resource_map *m;
+        resource_size_t start;
 
-        pcmcia_common_align(data, res, size, align);
+        start = pcmcia_common_align(data, res, size, align);
 
         for (m = data->map->next; m != data->map; m = m->next) {
                 unsigned long start = m->base;
@@ -567,8 +568,7 @@ pcmcia_align(void *align_data, struct resource *res, resource_size_t size,
                  * fit here.
                  */
                 if (res->start < start) {
-                        res->start = start;
-                        pcmcia_common_align(data, res, size, align);
+                        start = pcmcia_common_align(data, res, size, align);
                 }
 
                 /*
@@ -586,7 +586,9 @@ pcmcia_align(void *align_data, struct resource *res, resource_size_t size,
          * If we failed to find something suitable, ensure we fail.
          */
         if (m == data->map)
-                res->start = res->end;
+                start = res->end;
+
+        return start;
 }
 
 /*