You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[SCSI] remove Scsi_Host_Template typedef
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
committed by
James Bottomley
parent
c0ed79a331
commit
d0be4a7d29
@@ -346,7 +346,7 @@ Next, there is a movement to "outlaw" typedefs introducing synonyms for
|
||||
struct tags. Both can be still found in the SCSI subsystem, but
|
||||
the typedefs have been moved to a single file, scsi_typedefs.h to
|
||||
make their future removal easier, for example:
|
||||
"typedef struct scsi_host_template Scsi_Host_Template;"
|
||||
"typedef struct scsi_cmnd Scsi_Cmnd;"
|
||||
|
||||
Also, most C99 enhancements are encouraged to the extent they are supported
|
||||
by the relevant gcc compilers. So C99 style structure and array
|
||||
|
||||
@@ -343,7 +343,7 @@ static void NCR53c7x0_soft_reset (struct Scsi_Host *host);
|
||||
/* Size of event list (per host adapter) */
|
||||
static int track_events = 0;
|
||||
static struct Scsi_Host *first_host = NULL; /* Head of list of NCR boards */
|
||||
static Scsi_Host_Template *the_template = NULL;
|
||||
static struct scsi_host_template *the_template = NULL;
|
||||
|
||||
/* NCR53c710 script handling code */
|
||||
|
||||
@@ -1103,7 +1103,7 @@ NCR53c7x0_init (struct Scsi_Host *host) {
|
||||
}
|
||||
|
||||
/*
|
||||
* Function : int ncr53c7xx_init(Scsi_Host_Template *tpnt, int board, int chip,
|
||||
* Function : int ncr53c7xx_init(struct scsi_host_template *tpnt, int board, int chip,
|
||||
* unsigned long base, int io_port, int irq, int dma, long long options,
|
||||
* int clock);
|
||||
*
|
||||
@@ -1118,7 +1118,7 @@ NCR53c7x0_init (struct Scsi_Host *host) {
|
||||
*/
|
||||
|
||||
int
|
||||
ncr53c7xx_init (Scsi_Host_Template *tpnt, int board, int chip,
|
||||
ncr53c7xx_init (struct scsi_host_template *tpnt, int board, int chip,
|
||||
unsigned long base, int io_port, int irq, int dma,
|
||||
long long options, int clock)
|
||||
{
|
||||
|
||||
@@ -1600,7 +1600,7 @@ struct NCR53c7x0_hostdata {
|
||||
/* Paranoid people could use panic() here. */
|
||||
#define FATAL(host) shutdown((host));
|
||||
|
||||
extern int ncr53c7xx_init(Scsi_Host_Template *tpnt, int board, int chip,
|
||||
extern int ncr53c7xx_init(struct scsi_host_template *tpnt, int board, int chip,
|
||||
unsigned long base, int io_port, int irq, int dma,
|
||||
long long options, int clock);
|
||||
|
||||
|
||||
@@ -529,7 +529,7 @@ void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs)
|
||||
/* Allocate structure and insert basic data such as SCSI chip frequency
|
||||
* data and a pointer to the device
|
||||
*/
|
||||
struct NCR_ESP* esp_allocate(Scsi_Host_Template *tpnt, void *esp_dev)
|
||||
struct NCR_ESP* esp_allocate(struct scsi_host_template *tpnt, void *esp_dev)
|
||||
{
|
||||
struct NCR_ESP *esp, *elink;
|
||||
struct Scsi_Host *esp_host;
|
||||
|
||||
@@ -653,7 +653,7 @@ extern int nesps, esps_in_use, esps_running;
|
||||
|
||||
/* External functions */
|
||||
extern void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs);
|
||||
extern struct NCR_ESP *esp_allocate(Scsi_Host_Template *, void *);
|
||||
extern struct NCR_ESP *esp_allocate(struct scsi_host_template *, void *);
|
||||
extern void esp_deallocate(struct NCR_ESP *);
|
||||
extern void esp_release(void);
|
||||
extern void esp_initialize(struct NCR_ESP *);
|
||||
|
||||
@@ -447,7 +447,7 @@ static __inline__ int NCR53c406a_pio_write(unsigned char *request, unsigned int
|
||||
}
|
||||
#endif /* USE_PIO */
|
||||
|
||||
static int __init NCR53c406a_detect(Scsi_Host_Template * tpnt)
|
||||
static int __init NCR53c406a_detect(struct scsi_host_template * tpnt)
|
||||
{
|
||||
int present = 0;
|
||||
struct Scsi_Host *shpnt = NULL;
|
||||
@@ -1057,7 +1057,7 @@ MODULE_LICENSE("GPL");
|
||||
* Use SG_NONE if DMA mode is enabled!
|
||||
*/
|
||||
|
||||
static Scsi_Host_Template driver_template =
|
||||
static struct scsi_host_template driver_template =
|
||||
{
|
||||
.proc_name = "NCR53c406a" /* proc_name */,
|
||||
.name = "NCR53c406a" /* name */,
|
||||
|
||||
@@ -173,7 +173,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
|
||||
}
|
||||
}
|
||||
|
||||
int __init a2091_detect(Scsi_Host_Template *tpnt)
|
||||
int __init a2091_detect(struct scsi_host_template *tpnt)
|
||||
{
|
||||
static unsigned char called = 0;
|
||||
struct Scsi_Host *instance;
|
||||
@@ -234,7 +234,7 @@ static int a2091_bus_reset(Scsi_Cmnd *cmd)
|
||||
|
||||
#define HOSTS_C
|
||||
|
||||
static Scsi_Host_Template driver_template = {
|
||||
static struct scsi_host_template driver_template = {
|
||||
.proc_name = "A2901",
|
||||
.name = "Commodore A2091/A590 SCSI",
|
||||
.detect = a2091_detect,
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
int a2091_detect(Scsi_Host_Template *);
|
||||
int a2091_detect(struct scsi_host_template *);
|
||||
int a2091_release(struct Scsi_Host *);
|
||||
const char *wd33c93_info(void);
|
||||
int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
|
||||
|
||||
@@ -168,7 +168,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
|
||||
}
|
||||
}
|
||||
|
||||
int __init a3000_detect(Scsi_Host_Template *tpnt)
|
||||
int __init a3000_detect(struct scsi_host_template *tpnt)
|
||||
{
|
||||
wd33c93_regs regs;
|
||||
|
||||
@@ -221,7 +221,7 @@ static int a3000_bus_reset(Scsi_Cmnd *cmd)
|
||||
|
||||
#define HOSTS_C
|
||||
|
||||
static Scsi_Host_Template driver_template = {
|
||||
static struct scsi_host_template driver_template = {
|
||||
.proc_name = "A3000",
|
||||
.name = "Amiga 3000 built-in SCSI",
|
||||
.detect = a3000_detect,
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
int a3000_detect(Scsi_Host_Template *);
|
||||
int a3000_detect(struct scsi_host_template *);
|
||||
int a3000_release(struct Scsi_Host *);
|
||||
const char *wd33c93_info(void);
|
||||
int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
#include "advansys.h"
|
||||
#endif
|
||||
|
||||
and after "static Scsi_Host_Template builtin_scsi_hosts[] =":
|
||||
and after "static struct scsi_host_template builtin_scsi_hosts[] =":
|
||||
|
||||
#ifdef CONFIG_SCSI_ADVANSYS
|
||||
ADVANSYS,
|
||||
@@ -160,7 +160,7 @@
|
||||
--- Driver Structures
|
||||
--- Driver Data
|
||||
--- Driver Function Prototypes
|
||||
--- Linux 'Scsi_Host_Template' and advansys_setup() Functions
|
||||
--- Linux 'struct scsi_host_template' and advansys_setup() Functions
|
||||
--- Loadable Driver Support
|
||||
--- Miscellaneous Driver Functions
|
||||
--- Functions Required by the Asc Library
|
||||
@@ -4068,7 +4068,7 @@ STATIC void asc_prt_hex(char *f, uchar *, int);
|
||||
|
||||
|
||||
/*
|
||||
* --- Linux 'Scsi_Host_Template' and advansys_setup() Functions
|
||||
* --- Linux 'struct scsi_host_template' and advansys_setup() Functions
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#define _ADVANSYS_H
|
||||
|
||||
/*
|
||||
* Scsi_Host_Template function prototypes.
|
||||
* struct scsi_host_template function prototypes.
|
||||
*/
|
||||
int advansys_detect(struct scsi_host_template *);
|
||||
int advansys_release(struct Scsi_Host *);
|
||||
|
||||
@@ -424,7 +424,7 @@ MODULE_DEVICE_TABLE(isapnp, id_table);
|
||||
|
||||
static int registered_count=0;
|
||||
static struct Scsi_Host *aha152x_host[2];
|
||||
static Scsi_Host_Template aha152x_driver_template;
|
||||
static struct scsi_host_template aha152x_driver_template;
|
||||
|
||||
/*
|
||||
* internal states of the host
|
||||
@@ -3464,7 +3464,7 @@ static int aha152x_proc_info(struct Scsi_Host *shpnt, char *buffer, char **start
|
||||
return thislength < length ? thislength : length;
|
||||
}
|
||||
|
||||
static Scsi_Host_Template aha152x_driver_template = {
|
||||
static struct scsi_host_template aha152x_driver_template = {
|
||||
.module = THIS_MODULE,
|
||||
.name = AHA152X_REVID,
|
||||
.proc_name = "aha152x",
|
||||
|
||||
@@ -1021,7 +1021,7 @@ __setup("aha1542=",do_setup);
|
||||
#endif
|
||||
|
||||
/* return non-zero on detection */
|
||||
static int __init aha1542_detect(Scsi_Host_Template * tpnt)
|
||||
static int __init aha1542_detect(struct scsi_host_template * tpnt)
|
||||
{
|
||||
unsigned char dma_chan;
|
||||
unsigned char irq_level;
|
||||
@@ -1789,7 +1789,7 @@ static int aha1542_biosparam(struct scsi_device *sdev,
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
||||
static Scsi_Host_Template driver_template = {
|
||||
static struct scsi_host_template driver_template = {
|
||||
.proc_name = "aha1542",
|
||||
.name = "Adaptec 1542",
|
||||
.detect = aha1542_detect,
|
||||
|
||||
@@ -131,7 +131,7 @@ struct ccb { /* Command Control Block 5.3 */
|
||||
/* REQUEST SENSE */
|
||||
};
|
||||
|
||||
static int aha1542_detect(Scsi_Host_Template *);
|
||||
static int aha1542_detect(struct scsi_host_template *);
|
||||
static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
|
||||
static int aha1542_bus_reset(Scsi_Cmnd * SCpnt);
|
||||
static int aha1542_dev_reset(Scsi_Cmnd * SCpnt);
|
||||
|
||||
@@ -570,7 +570,7 @@ static int aha1740_eh_abort_handler (Scsi_Cmnd *dummy)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static Scsi_Host_Template aha1740_template = {
|
||||
static struct scsi_host_template aha1740_template = {
|
||||
.module = THIS_MODULE,
|
||||
.proc_name = "aha1740",
|
||||
.proc_info = aha1740_proc_info,
|
||||
|
||||
+1
-1
@@ -196,7 +196,7 @@ static u8 ahci_check_status(struct ata_port *ap);
|
||||
static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
|
||||
static void ahci_remove_one (struct pci_dev *pdev);
|
||||
|
||||
static Scsi_Host_Template ahci_sht = {
|
||||
static struct scsi_host_template ahci_sht = {
|
||||
.module = THIS_MODULE,
|
||||
.name = DRV_NAME,
|
||||
.ioctl = ata_scsi_ioctl,
|
||||
|
||||
@@ -7865,7 +7865,7 @@ detect_maxscb(struct aic7xxx_host *p)
|
||||
* Register a Adaptec aic7xxx chip SCSI controller with the kernel.
|
||||
*-F*************************************************************************/
|
||||
static int
|
||||
aic7xxx_register(Scsi_Host_Template *template, struct aic7xxx_host *p,
|
||||
aic7xxx_register(struct scsi_host_template *template, struct aic7xxx_host *p,
|
||||
int reset_delay)
|
||||
{
|
||||
int i, result;
|
||||
@@ -8412,7 +8412,7 @@ aic7xxx_chip_reset(struct aic7xxx_host *p)
|
||||
* and a pointer to a aic7xxx_host struct upon success.
|
||||
*-F*************************************************************************/
|
||||
static struct aic7xxx_host *
|
||||
aic7xxx_alloc(Scsi_Host_Template *sht, struct aic7xxx_host *temp)
|
||||
aic7xxx_alloc(struct scsi_host_template *sht, struct aic7xxx_host *temp)
|
||||
{
|
||||
struct aic7xxx_host *p = NULL;
|
||||
struct Scsi_Host *host;
|
||||
@@ -8991,7 +8991,7 @@ aic7xxx_configure_bugs(struct aic7xxx_host *p)
|
||||
* mid-level SCSI code is overhauled.
|
||||
*-F*************************************************************************/
|
||||
static int
|
||||
aic7xxx_detect(Scsi_Host_Template *template)
|
||||
aic7xxx_detect(struct scsi_host_template *template)
|
||||
{
|
||||
struct aic7xxx_host *temp_p = NULL;
|
||||
struct aic7xxx_host *current_p = NULL;
|
||||
@@ -11161,7 +11161,7 @@ MODULE_LICENSE("Dual BSD/GPL");
|
||||
MODULE_VERSION(AIC7XXX_H_VERSION);
|
||||
|
||||
|
||||
static Scsi_Host_Template driver_template = {
|
||||
static struct scsi_host_template driver_template = {
|
||||
.proc_info = aic7xxx_proc_info,
|
||||
.detect = aic7xxx_detect,
|
||||
.release = aic7xxx_release,
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "amiga7xx.h"
|
||||
|
||||
|
||||
static int amiga7xx_register_one(Scsi_Host_Template *tpnt,
|
||||
static int amiga7xx_register_one(struct scsi_host_template *tpnt,
|
||||
unsigned long address)
|
||||
{
|
||||
long long options;
|
||||
@@ -66,7 +66,7 @@ static struct {
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
static int __init amiga7xx_zorro_detect(Scsi_Host_Template *tpnt)
|
||||
static int __init amiga7xx_zorro_detect(struct scsi_host_template *tpnt)
|
||||
{
|
||||
int num = 0, i;
|
||||
struct zorro_dev *z = NULL;
|
||||
@@ -90,7 +90,7 @@ static int __init amiga7xx_zorro_detect(Scsi_Host_Template *tpnt)
|
||||
#endif /* CONFIG_ZORRO */
|
||||
|
||||
|
||||
int __init amiga7xx_detect(Scsi_Host_Template *tpnt)
|
||||
int __init amiga7xx_detect(struct scsi_host_template *tpnt)
|
||||
{
|
||||
static unsigned char called = 0;
|
||||
int num = 0;
|
||||
@@ -123,7 +123,7 @@ static int amiga7xx_release(struct Scsi_Host *shost)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static Scsi_Host_Template driver_template = {
|
||||
static struct scsi_host_template driver_template = {
|
||||
.name = "Amiga NCR53c710 SCSI",
|
||||
.detect = amiga7xx_detect,
|
||||
.release = amiga7xx_release,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
int amiga7xx_detect(Scsi_Host_Template *);
|
||||
int amiga7xx_detect(struct scsi_host_template *);
|
||||
const char *NCR53c7x0_info(void);
|
||||
int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
|
||||
int NCR53c7xx_abort(Scsi_Cmnd *);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user