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

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

ncr5380: Use shost_priv helper 



Make use of the shost_priv() helper. Remove HOSTDATA and SETUP_HOSTDATA
macros because they harm readability.

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 dbb6b350

drivers/scsi/NCR5380.c

+10 −13
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static irqreturn_t __init probe_intr(int irq, void *dev_id) 
static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance,

						int possible)

{

	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	unsigned long timeout;

	int trying_irqs, i, mask;
@@ -586,9 +586,7 @@ static int __maybe_unused NCR5380_write_info(struct Scsi_Host *instance, 
static int __maybe_unused NCR5380_show_info(struct seq_file *m,

	struct Scsi_Host *instance)

{

	struct NCR5380_hostdata *hostdata;



	hostdata = (struct NCR5380_hostdata *) instance->hostdata;

	struct NCR5380_hostdata *hostdata = shost_priv(instance);



	seq_printf(m, "Highwater I/O busy spin counts: write %d, read %d\n",

	        hostdata->spin_max_w, hostdata->spin_max_r);
@@ -614,8 +612,8 @@ static int __maybe_unused NCR5380_show_info(struct seq_file *m, 


static int NCR5380_init(struct Scsi_Host *instance, int flags)

{

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	int i;

	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;

	unsigned long deadline;



	if(in_interrupt())
@@ -728,7 +726,7 @@ static int NCR5380_maybe_reset_bus(struct Scsi_Host *instance) 


static void NCR5380_exit(struct Scsi_Host *instance)

{

	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;

	struct NCR5380_hostdata *hostdata = shost_priv(instance);



	cancel_work_sync(&hostdata->main_task);

	destroy_workqueue(hostdata->work_q);
@@ -1037,7 +1035,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) 
 

static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)

{

	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	unsigned char tmp[3], phase;

	unsigned char *data;

	int len;
@@ -1511,7 +1509,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase 
	unsigned char saved_data = 0, overrun = 0, residue;

#endif



	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;

	struct NCR5380_hostdata *hostdata = shost_priv(instance);



	if ((tmp = (NCR5380_read(STATUS_REG) & PHASE_MASK)) != p) {

		*phase = tmp;
@@ -1743,7 +1741,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase 
 */



static void NCR5380_information_transfer(struct Scsi_Host *instance) {

	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *)instance->hostdata;

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	unsigned char msgout = NOP;

	int sink = 0;

	int len;
@@ -2090,8 +2088,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { 
 */



static void NCR5380_reselect(struct Scsi_Host *instance) {

	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *)

	 instance->hostdata;

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	unsigned char target_mask;

	unsigned char lun, phase;

	int len;
@@ -2214,7 +2211,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) { 


#ifdef REAL_DMA

static void NCR5380_dma_complete(NCR5380_instance * instance) {

	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	int transferred;



	/*
@@ -2268,7 +2265,7 @@ static void NCR5380_dma_complete(NCR5380_instance * instance) { 
static int NCR5380_abort(struct scsi_cmnd *cmd)

{

	struct Scsi_Host *instance = cmd->device->host;

	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	struct scsi_cmnd *tmp, **prev;

	unsigned long flags;

drivers/scsi/atari_NCR5380.c

+7 −13
Original line number Diff line number Diff line
@@ -196,12 +196,6 @@ 
 * possible) function may be used.

 */



/* Macros ease life... :-) */

#define	SETUP_HOSTDATA(in)				\

    struct NCR5380_hostdata *hostdata =			\

	(struct NCR5380_hostdata *)(in)->hostdata

#define	HOSTDATA(in) ((struct NCR5380_hostdata *)(in)->hostdata)



#define	NEXT(cmd)		((struct scsi_cmnd *)(cmd)->host_scribble)

#define	SET_NEXT(cmd,next)	((cmd)->host_scribble = (void *)(next))

#define	NEXTADDR(cmd)		((struct scsi_cmnd **)&(cmd)->host_scribble)
@@ -672,8 +666,8 @@ static void prepare_info(struct Scsi_Host *instance) 


static int __init NCR5380_init(struct Scsi_Host *instance, int flags)

{

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	int i;

	SETUP_HOSTDATA(instance);

	unsigned long deadline;



	hostdata->host = instance;
@@ -1038,7 +1032,7 @@ static void NCR5380_main(struct work_struct *work) 


static void NCR5380_dma_complete(struct Scsi_Host *instance)

{

	SETUP_HOSTDATA(instance);

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	int transferred;

	unsigned char **data;

	volatile int *count;
@@ -1248,7 +1242,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) 


static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)

{

	SETUP_HOSTDATA(instance);

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	unsigned char tmp[3], phase;

	unsigned char *data;

	int len;
@@ -1742,7 +1736,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, 
				unsigned char *phase, int *count,

				unsigned char **data)

{

	SETUP_HOSTDATA(instance);

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	register int c = *count;

	register unsigned char p = *phase;
@@ -1850,7 +1844,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, 


static void NCR5380_information_transfer(struct Scsi_Host *instance)

{

	SETUP_HOSTDATA(instance);

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	unsigned char msgout = NOP;

	int sink = 0;

	int len;
@@ -2314,7 +2308,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) 


static void NCR5380_reselect(struct Scsi_Host *instance)

{

	SETUP_HOSTDATA(instance);

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	unsigned char target_mask;

	unsigned char lun;

#ifdef SUPPORT_TAGS
@@ -2521,7 +2515,7 @@ static 
int NCR5380_abort(struct scsi_cmnd *cmd)

{

	struct Scsi_Host *instance = cmd->device->host;

	SETUP_HOSTDATA(instance);

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	struct scsi_cmnd *tmp, **prev;

	unsigned long flags;