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

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

[SCSI] remove Scsi_Device typedef 



Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 0a04137e

Documentation/scsi/scsi_mid_low_api.txt

+1 −1
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ void scsi_report_bus_reset(struct Scsi_Host * shost, int channel) 
 *

 *      Defined in: drivers/scsi/scsi.c .

 **/

int scsi_track_queue_full(Scsi_Device *sdev, int depth)

int scsi_track_queue_full(struct scsi_device *sdev, int depth)





/**

drivers/block/acsi.c

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
#include <linux/slab.h>

#include <linux/interrupt.h>

#include <scsi/scsi.h> /* for SCSI_IOCTL_GET_IDLUN */

typedef void Scsi_Device; /* hack to avoid including scsi.h */

#include <scsi/scsi_ioctl.h>

#include <linux/hdreg.h> /* for HDIO_GETGEO */

#include <linux/blkpg.h>

drivers/scsi/NCR53C9x.c

+4 −4
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static void esp_exec_cmd(struct NCR_ESP *esp) 
	struct ESP_regs *eregs = esp->eregs;

	struct esp_device *esp_dev;

	Scsi_Cmnd *SCptr;

	Scsi_Device *SDptr;

	struct scsi_device *SDptr;

	volatile unchar *cmdp = esp->esp_command;

	unsigned char the_esp_command;

	int lun, target;
@@ -1687,7 +1687,7 @@ static inline int reconnect_lun(struct NCR_ESP *esp, struct ESP_regs *eregs) 
static inline void esp_connect(struct NCR_ESP *esp, struct ESP_regs *eregs,

			       Scsi_Cmnd *sp)

{

	Scsi_Device *dp = sp->device;

	struct scsi_device *dp = sp->device;

	struct esp_device *esp_dev = dp->hostdata;



	if(esp->prev_soff  != esp_dev->sync_max_offset ||
@@ -3605,7 +3605,7 @@ out: 
}

#endif



int esp_slave_alloc(Scsi_Device *SDptr)

int esp_slave_alloc(struct scsi_device *SDptr)

{

	struct esp_device *esp_dev =

		kmalloc(sizeof(struct esp_device), GFP_ATOMIC);
@@ -3617,7 +3617,7 @@ int esp_slave_alloc(Scsi_Device *SDptr) 
	return 0;

}



void esp_slave_destroy(Scsi_Device *SDptr)

void esp_slave_destroy(struct scsi_device *SDptr)

{

	struct NCR_ESP *esp = (struct NCR_ESP *) SDptr->host->hostdata;

drivers/scsi/NCR53C9x.h

+2 −2
Original line number Diff line number Diff line
@@ -664,6 +664,6 @@ extern int esp_abort(Scsi_Cmnd *); 
extern int esp_reset(Scsi_Cmnd *);

extern int esp_proc_info(struct Scsi_Host *shost, char *buffer, char **start, off_t offset, int length,

			 int inout);

extern int esp_slave_alloc(Scsi_Device *);

extern void esp_slave_destroy(Scsi_Device *);

extern int esp_slave_alloc(struct scsi_device *);

extern void esp_slave_destroy(struct scsi_device *);

#endif /* !(NCR53C9X_H) */

drivers/scsi/aacraid/commsup.c

+2 −2
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr) 
				break;



			/*

			 *	Find the Scsi_Device associated with the SCSI

			 *	Find the scsi_device associated with the SCSI

			 * address. Make sure we have the right array, and if

			 * so set the flag to initiate a new re-config once we

			 * see an AifEnConfigChange AIF come through.
@@ -987,7 +987,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr) 




	/*

	 *	Find the Scsi_Device associated with the SCSI address,

	 *	Find the scsi_device associated with the SCSI address,

	 * and mark it as changed, invalidating the cache. This deals

	 * with changes to existing device IDs.

	 */