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

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

ncr5380: Fix and cleanup scsi_host_template initializers 



Add missing .module initializer. Use distinct .proc_name values for the
g_NCR5380 and g_NCR5380_mmio modules. Remove pointless CAN_QUEUE and
CMD_PER_LUN override macros. Cleanup whitespace and code style.

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>
Tested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent bf1a0c6f

drivers/scsi/atari_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ static struct scsi_host_template atari_scsi_template = { 
	.eh_abort_handler	= atari_scsi_abort,

	.eh_bus_reset_handler	= atari_scsi_bus_reset,

	.this_id		= 7,

	.use_clustering		= DISABLE_CLUSTERING

	.use_clustering		= DISABLE_CLUSTERING,

};



static int __init atari_scsi_probe(struct platform_device *pdev)

drivers/scsi/dmx3191d.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 




static struct scsi_host_template dmx3191d_driver_template = {

	.module			= THIS_MODULE,

	.proc_name		= DMX3191D_DRIVER_NAME,

	.name			= "Domex DMX3191D",

	.info			= NCR5380_info,

drivers/scsi/dtc.c

+16 −16
Original line number Diff line number Diff line
@@ -447,10 +447,10 @@ static struct scsi_host_template driver_template = { 
	.eh_abort_handler	= dtc_abort,

	.eh_bus_reset_handler	= dtc_bus_reset,

	.bios_param		= dtc_biosparam,

	.can_queue      		= CAN_QUEUE,

	.can_queue		= 32,

	.this_id		= 7,

	.sg_tablesize		= SG_ALL,

	.cmd_per_lun    		= CMD_PER_LUN,

	.cmd_per_lun		= 2,

	.use_clustering		= DISABLE_CLUSTERING,

};

#include "scsi_module.c"

drivers/scsi/dtc.h

+0 −8
Original line number Diff line number Diff line
@@ -10,14 +10,6 @@ 
#ifndef DTC3280_H

#define DTC3280_H



#ifndef CMD_PER_LUN

#define CMD_PER_LUN 2

#endif



#ifndef CAN_QUEUE

#define CAN_QUEUE 32 

#endif



#define NCR5380_implementation_fields \

    void __iomem *base

drivers/scsi/g_NCR5380.c

+13 −13
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt) 
		}

	}

#endif

	tpnt->proc_name = "g_NCR5380";



	for (count = 0; current_override < NO_OVERRIDES; ++current_override) {

		if (!(overrides[current_override].NCR5380_map_name))
@@ -715,6 +714,7 @@ static int generic_NCR5380_dma_xfer_len(struct scsi_cmnd *cmd) 
#include "NCR5380.c"



static struct scsi_host_template driver_template = {

	.proc_name		= DRV_MODULE_NAME,

	.show_info		= generic_NCR5380_show_info,

	.name			= "Generic NCR5380/NCR53C400 SCSI",

	.detect			= generic_NCR5380_detect,
@@ -724,10 +724,10 @@ static struct scsi_host_template driver_template = { 
	.eh_abort_handler	= generic_NCR5380_abort,

	.eh_bus_reset_handler	= generic_NCR5380_bus_reset,

	.bios_param		= NCR5380_BIOSPARAM,

	.can_queue      	= CAN_QUEUE,

	.can_queue		= 16,

	.this_id		= 7,

	.sg_tablesize		= SG_ALL,

	.cmd_per_lun    	= CMD_PER_LUN,

	.cmd_per_lun		= 2,

	.use_clustering		= DISABLE_CLUSTERING,

};