treewide: Convert uses of struct resource to resource_size(ptr)

Several fixes as well where the +1 was missing.

Done via coccinelle scripts like:

@@
struct resource *ptr;
@@

- ptr->end - ptr->start + 1
+ resource_size(ptr)

and some grep and typing.

Mostly uncompiled, no cross-compilers.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

2 files changed, 11 insertions, 11 deletions

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 100e4d9372f1..1a6937d9118f 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -1018,7 +1018,7 @@ static void pnpacpi_encode_io(struct pnp_dev *dev,
                 io->minimum = p->start;
                 io->maximum = p->end;
                 io->alignment = 0;      /* Correct? */
-                io->address_length = p->end - p->start + 1;
+                io->address_length = resource_size(p);
         } else {
                 io->minimum = 0;
                 io->address_length = 0;
@@ -1036,7 +1036,7 @@ static void pnpacpi_encode_fixed_io(struct pnp_dev *dev,
 
         if (pnp_resource_enabled(p)) {
                 fixed_io->address = p->start;
-                fixed_io->address_length = p->end - p->start + 1;
+                fixed_io->address_length = resource_size(p);
         } else {
                 fixed_io->address = 0;
                 fixed_io->address_length = 0;
@@ -1059,7 +1059,7 @@ static void pnpacpi_encode_mem24(struct pnp_dev *dev,
                 memory24->minimum = p->start;
                 memory24->maximum = p->end;
                 memory24->alignment = 0;
-                memory24->address_length = p->end - p->start + 1;
+                memory24->address_length = resource_size(p);
         } else {
                 memory24->minimum = 0;
                 memory24->address_length = 0;
@@ -1083,7 +1083,7 @@ static void pnpacpi_encode_mem32(struct pnp_dev *dev,
                 memory32->minimum = p->start;
                 memory32->maximum = p->end;
                 memory32->alignment = 0;
-                memory32->address_length = p->end - p->start + 1;
+                memory32->address_length = resource_size(p);
         } else {
                 memory32->minimum = 0;
                 memory32->alignment = 0;
@@ -1106,7 +1106,7 @@ static void pnpacpi_encode_fixed_mem32(struct pnp_dev *dev,
                     p->flags & IORESOURCE_MEM_WRITEABLE ?
                     ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
                 fixed_memory32->address = p->start;
-                fixed_memory32->address_length = p->end - p->start + 1;
+                fixed_memory32->address_length = resource_size(p);
         } else {
                 fixed_memory32->address = 0;
                 fixed_memory32->address_length = 0;
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index cb1f47bfee96..cca2f9f9f3e3 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -505,7 +505,7 @@ static void pnpbios_encode_mem(struct pnp_dev *dev, unsigned char *p,
 
         if (pnp_resource_enabled(res)) {
                 base = res->start;
-                len = res->end - res->start + 1;
+                len = resource_size(res);
         } else {
                 base = 0;
                 len = 0;
@@ -529,7 +529,7 @@ static void pnpbios_encode_mem32(struct pnp_dev *dev, unsigned char *p,
 
         if (pnp_resource_enabled(res)) {
                 base = res->start;
-                len = res->end - res->start + 1;
+                len = resource_size(res);
         } else {
                 base = 0;
                 len = 0;
@@ -559,7 +559,7 @@ static void pnpbios_encode_fixed_mem32(struct pnp_dev *dev, unsigned char *p,
 
         if (pnp_resource_enabled(res)) {
                 base = res->start;
-                len = res->end - res->start + 1;
+                len = resource_size(res);
         } else {
                 base = 0;
                 len = 0;
@@ -617,7 +617,7 @@ static void pnpbios_encode_port(struct pnp_dev *dev, unsigned char *p,
 
         if (pnp_resource_enabled(res)) {
                 base = res->start;
-                len = res->end - res->start + 1;
+                len = resource_size(res);
         } else {
                 base = 0;
                 len = 0;
@@ -636,11 +636,11 @@ static void pnpbios_encode_fixed_port(struct pnp_dev *dev, unsigned char *p,
                                       struct resource *res)
 {
         unsigned long base = res->start;
-        unsigned long len = res->end - res->start + 1;
+        unsigned long len = resource_size(res);
 
         if (pnp_resource_enabled(res)) {
                 base = res->start;
-                len = res->end - res->start + 1;
+                len = resource_size(res);
         } else {
                 base = 0;
                 len = 0;