[PATCH 06/71] ncr5380: Remove NCR5380_instance_name macro

[Finn Thain]

This macro makes the code cryptic. Remove it.

Signed-off-by: Finn Thain 

---
 drivers/scsi/NCR5380.c   |2 +-
 drivers/scsi/g_NCR5380.c |7 ---
 drivers/scsi/g_NCR5380.h |2 --
 3 files changed, 5 insertions(+), 6 deletions(-)

Index: linux/drivers/scsi/g_NCR5380.c
===
--- linux.orig/drivers/scsi/g_NCR5380.c 2015-11-18 19:33:05.0 +1100
+++ linux/drivers/scsi/g_NCR5380.c  2015-11-18 19:33:09.0 +1100
@@ -412,10 +412,11 @@ static int __init generic_NCR5380_detect
continue;
}
 
-   instance->NCR5380_instance_name = 
overrides[current_override].NCR5380_map_name;
 #ifndef SCSI_G_NCR5380_MEM
+   instance->io_port = 
overrides[current_override].NCR5380_map_name;
instance->n_io_port = region_size;
 #else
+   instance->base = overrides[current_override].NCR5380_map_name;
((struct NCR5380_hostdata *)instance->hostdata)->iomem = iomem;
 #endif
 
@@ -464,10 +465,10 @@ static int generic_NCR5380_release_resou
NCR5380_exit(instance);
 
 #ifndef SCSI_G_NCR5380_MEM
-   release_region(instance->NCR5380_instance_name, instance->n_io_port);
+   release_region(instance->io_port, instance->n_io_port);
 #else
iounmap(((struct NCR5380_hostdata *)instance->hostdata)->iomem);
-   release_mem_region(instance->NCR5380_instance_name, 
NCR5380_region_size);
+   release_mem_region(instance->base, NCR5380_region_size);
 #endif
 
 
Index: linux/drivers/scsi/g_NCR5380.h
===
--- linux.orig/drivers/scsi/g_NCR5380.h 2015-11-18 19:33:05.0 +1100
+++ linux/drivers/scsi/g_NCR5380.h  2015-11-18 19:33:09.0 +1100
@@ -36,7 +36,6 @@
 
 #define NCR5380_map_type int
 #define NCR5380_map_name port
-#define NCR5380_instance_name io_port
 #define NCR53C400_register_offset 0
 #define NCR53C400_address_adjust 8
 
@@ -58,7 +57,6 @@
 
 #define NCR5380_map_type unsigned long
 #define NCR5380_map_name base
-#define NCR5380_instance_name base
 #define NCR53C400_register_offset 0x108
 #define NCR53C400_address_adjust 0
 #define NCR53C400_mem_base 0x3880
Index: linux/drivers/scsi/NCR5380.c
===
--- linux.orig/drivers/scsi/NCR5380.c   2015-11-18 19:33:05.0 +1100
+++ linux/drivers/scsi/NCR5380.c2015-11-18 19:33:09.0 +1100
@@ -790,7 +790,7 @@ static int NCR5380_init(struct Scsi_Host
 
 #ifdef NCR53C400
if (flags & FLAG_NCR53C400)
-   instance->NCR5380_instance_name += NCR53C400_address_adjust;
+   instance->io_port += NCR53C400_address_adjust;
 #endif
 
hostdata->aborted = 0;


--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 06/71] ncr5380: Remove NCR5380_instance_name macro

[Hannes Reinecke]

On 11/18/2015 09:35 AM, Finn Thain wrote:

This macro makes the code cryptic. Remove it.

Signed-off-by: Finn Thain 

---
  drivers/scsi/NCR5380.c   |2 +-
  drivers/scsi/g_NCR5380.c |7 ---
  drivers/scsi/g_NCR5380.h |2 --
  3 files changed, 5 insertions(+), 6 deletions(-)


Reviewed-by: Hannes Reinecke 

Cheers,

Hannes
--
Dr. Hannes ReineckezSeries & Storage
h...@suse.de   +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html