Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b01ec348 authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files

ncr5380: Remove NCR5380_instance_name macro 



This macro makes the code cryptic. Remove it.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 54d8fe44

drivers/scsi/NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags) 


#ifdef NCR53C400

	if (flags & FLAG_NCR53C400)

		instance->NCR5380_instance_name += NCR53C400_address_adjust;

		instance->io_port += NCR53C400_address_adjust;

#endif



	hostdata->aborted = 0;

drivers/scsi/g_NCR5380.c

+4 −3
Original line number Diff line number Diff line
@@ -412,10 +412,11 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt) 
			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_resources(struct Scsi_Host *instance) 
	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

drivers/scsi/g_NCR5380.h

+0 −2
Original line number Diff line number Diff line
@@ -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