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

Commit 2b14ec78 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[SCSI] esp: use shost_priv 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent bcd92c9f

drivers/scsi/esp_scsi.c

+10 −10
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ static void esp_event_queue_full(struct esp *esp, struct esp_cmd_entry *ent) 
static int esp_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))

{

	struct scsi_device *dev = cmd->device;

	struct esp *esp = host_to_esp(dev->host);

	struct esp *esp = shost_priv(dev->host);

	struct esp_cmd_priv *spriv;

	struct esp_cmd_entry *ent;
@@ -2356,7 +2356,7 @@ EXPORT_SYMBOL(scsi_esp_unregister); 


static int esp_slave_alloc(struct scsi_device *dev)

{

	struct esp *esp = host_to_esp(dev->host);

	struct esp *esp = shost_priv(dev->host);

	struct esp_target_data *tp = &esp->target[dev->id];

	struct esp_lun_data *lp;
@@ -2380,7 +2380,7 @@ static int esp_slave_alloc(struct scsi_device *dev) 


static int esp_slave_configure(struct scsi_device *dev)

{

	struct esp *esp = host_to_esp(dev->host);

	struct esp *esp = shost_priv(dev->host);

	struct esp_target_data *tp = &esp->target[dev->id];

	int goal_tags, queue_depth;
@@ -2422,7 +2422,7 @@ static void esp_slave_destroy(struct scsi_device *dev) 


static int esp_eh_abort_handler(struct scsi_cmnd *cmd)

{

	struct esp *esp = host_to_esp(cmd->device->host);

	struct esp *esp = shost_priv(cmd->device->host);

	struct esp_cmd_entry *ent, *tmp;

	struct completion eh_done;

	unsigned long flags;
@@ -2538,7 +2538,7 @@ static int esp_eh_abort_handler(struct scsi_cmnd *cmd) 


static int esp_eh_bus_reset_handler(struct scsi_cmnd *cmd)

{

	struct esp *esp = host_to_esp(cmd->device->host);

	struct esp *esp = shost_priv(cmd->device->host);

	struct completion eh_reset;

	unsigned long flags;
@@ -2574,7 +2574,7 @@ static int esp_eh_bus_reset_handler(struct scsi_cmnd *cmd) 
/* All bets are off, reset the entire device.  */

static int esp_eh_host_reset_handler(struct scsi_cmnd *cmd)

{

	struct esp *esp = host_to_esp(cmd->device->host);

	struct esp *esp = shost_priv(cmd->device->host);

	unsigned long flags;



	spin_lock_irqsave(esp->host->host_lock, flags);
@@ -2614,7 +2614,7 @@ EXPORT_SYMBOL(scsi_esp_template); 


static void esp_get_signalling(struct Scsi_Host *host)

{

	struct esp *esp = host_to_esp(host);

	struct esp *esp = shost_priv(host);

	enum spi_signal_type type;



	if (esp->flags & ESP_FLAG_DIFFERENTIAL)
@@ -2628,7 +2628,7 @@ static void esp_get_signalling(struct Scsi_Host *host) 
static void esp_set_offset(struct scsi_target *target, int offset)

{

	struct Scsi_Host *host = dev_to_shost(target->dev.parent);

	struct esp *esp = host_to_esp(host);

	struct esp *esp = shost_priv(host);

	struct esp_target_data *tp = &esp->target[target->id];



	tp->nego_goal_offset = offset;
@@ -2638,7 +2638,7 @@ static void esp_set_offset(struct scsi_target *target, int offset) 
static void esp_set_period(struct scsi_target *target, int period)

{

	struct Scsi_Host *host = dev_to_shost(target->dev.parent);

	struct esp *esp = host_to_esp(host);

	struct esp *esp = shost_priv(host);

	struct esp_target_data *tp = &esp->target[target->id];



	tp->nego_goal_period = period;
@@ -2648,7 +2648,7 @@ static void esp_set_period(struct scsi_target *target, int period) 
static void esp_set_width(struct scsi_target *target, int width)

{

	struct Scsi_Host *host = dev_to_shost(target->dev.parent);

	struct esp *esp = host_to_esp(host);

	struct esp *esp = shost_priv(host);

	struct esp_target_data *tp = &esp->target[target->id];



	tp->nego_goal_width = (width ? 1 : 0);

drivers/scsi/esp_scsi.h

+0 −2
Original line number Diff line number Diff line
@@ -517,8 +517,6 @@ struct esp { 
	struct sbus_dma		*dma;

};



#define host_to_esp(host)	((struct esp *)(host)->hostdata)



/* A front-end driver for the ESP chip should do the following in

 * it's device probe routine:

 * 1) Allocate the host and private area using scsi_host_alloc()

drivers/scsi/jazz_esp.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int __devinit esp_jazz_probe(struct platform_device *dev) 
		goto fail;



	host->max_id = 8;

	esp = host_to_esp(host);

	esp = shost_priv(host);



	esp->host = host;

	esp->dev = dev;

drivers/scsi/sun_esp.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int __devinit esp_sbus_probe_one(struct device *dev, 
		goto fail;



	host->max_id = (hme ? 16 : 8);

	esp = host_to_esp(host);

	esp = shost_priv(host);



	esp->host = host;

	esp->dev = esp_dev;