Commit 72961735 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: nsp_cs: Change the return type of two functions into 'void' 

nsp_reselected() and nsphw_init() always return TRUE. Change the return type
of these functions into 'void'.

Link: https://lore.kernel.org/r/20220218195117.25689-5-bvanassche@acm.org


Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Cc: John Garry <john.garry@huawei.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c4858224

drivers/scsi/pcmcia/nsp_cs.c

+5 −12
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static void nsphw_init_sync(nsp_hw_data *data) 
/*

 * Initialize Ninja hardware

 */

static int nsphw_init(nsp_hw_data *data)

static void nsphw_init(nsp_hw_data *data)

{

	unsigned int base     = data->BaseAddress;
@@ -349,8 +349,6 @@ static int nsphw_init(nsp_hw_data *data) 
	nsp_write(base,	      IRQCONTROL,   IRQCONTROL_ALLCLEAR);



	nsp_setup_fifo(data, FALSE);



	return TRUE;

}



/*
@@ -643,7 +641,7 @@ static int nsp_dataphase_bypass(struct scsi_cmnd *SCpnt) 
/*

 * accept reselection

 */

static int nsp_reselected(struct scsi_cmnd *SCpnt)

static void nsp_reselected(struct scsi_cmnd *SCpnt)

{

	unsigned int  base    = SCpnt->device->host->io_port;

	unsigned int  host_id = SCpnt->device->host->this_id;
@@ -675,8 +673,6 @@ static int nsp_reselected(struct scsi_cmnd *SCpnt) 
	bus_reg = nsp_index_read(base, SCSIBUSCTRL) & ~(SCSI_BSY | SCSI_ATN);

	nsp_index_write(base, SCSIBUSCTRL, bus_reg);

	nsp_index_write(base, SCSIBUSCTRL, bus_reg | AUTODIRECTION | ACKENB);



	return TRUE;

}



/*
@@ -1057,10 +1053,9 @@ static irqreturn_t nspintr(int irq, void *dev_id) 
		if (irq_phase & RESELECT_IRQ) {

			nsp_dbg(NSP_DEBUG_INTR, "reselect");

			nsp_write(base, IRQCONTROL, IRQCONTROL_RESELECT_CLEAR);

			if (nsp_reselected(tmpSC) != FALSE) {

			nsp_reselected(tmpSC);

			return IRQ_HANDLED;

		}

		}



		if ((irq_phase & (PHASE_CHANGE_IRQ | LATCHED_BUS_FREE)) == 0) {

			return IRQ_HANDLED;
@@ -1614,9 +1609,7 @@ static int nsp_cs_config(struct pcmcia_device *link) 
	nsp_dbg(NSP_DEBUG_INIT, "I/O[0x%x+0x%x] IRQ %d",

		data->BaseAddress, data->NumAddress, data->IrqNumber);



	if(nsphw_init(data) == FALSE) {

		goto cs_failed;

	}

	nsphw_init(data);



	host = nsp_detect(&nsp_driver_template);

drivers/scsi/pcmcia/nsp_cs.h

+2 −2
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int nsp_eh_host_reset (struct scsi_cmnd *SCpnt); 
static int nsp_bus_reset       (nsp_hw_data *data);



/* */

static int  nsphw_init           (nsp_hw_data *data);

static void nsphw_init           (nsp_hw_data *data);

static int  nsphw_start_selection(struct scsi_cmnd *SCpnt);

static void nsp_start_timer      (struct scsi_cmnd *SCpnt, int time);

static int  nsp_fifo_count       (struct scsi_cmnd *SCpnt);
@@ -320,7 +320,7 @@ static int nsp_expect_signal (struct scsi_cmnd *SCpnt, 
				  unsigned char  mask);

static int  nsp_xfer             (struct scsi_cmnd *SCpnt, int phase);

static int  nsp_dataphase_bypass (struct scsi_cmnd *SCpnt);

static int  nsp_reselected       (struct scsi_cmnd *SCpnt);

static void nsp_reselected       (struct scsi_cmnd *SCpnt);

static struct Scsi_Host *nsp_detect(struct scsi_host_template *sht);



/* Interrupt handler */