Skip to content

L
linux-davinci
Commit 013791ee authored by Christoph Hellwig 's avatar Christoph Hellwig Committed by James Bottomley
Browse files
Options

[SCSI] aic7xxx: remove usage of obsolete typedefs 

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 7dfa0f26
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 51 deletions
drivers/scsi/aic7xxx/aic7xxx_osm.c
View file @ 013791ee
...@@ -426,12 +426,12 @@ static void ahc_linux_handle_scsi_status(struct ahc_softc *, ...@@ -426,12 +426,12 @@ static void ahc_linux_handle_scsi_status(struct ahc_softc *,
struct ahc_linux_device *, struct ahc_linux_device *,
struct scb *); struct scb *);
static void ahc_linux_queue_cmd_complete(struct ahc_softc *ahc, static void ahc_linux_queue_cmd_complete(struct ahc_softc *ahc,
Scsi_Cmnd *cmd); struct scsi_cmnd *cmd);
static void ahc_linux_sem_timeout(u_long arg); static void ahc_linux_sem_timeout(u_long arg);
static void ahc_linux_freeze_simq(struct ahc_softc *ahc); static void ahc_linux_freeze_simq(struct ahc_softc *ahc);
static void ahc_linux_release_simq(u_long arg); static void ahc_linux_release_simq(u_long arg);
static void ahc_linux_dev_timed_unfreeze(u_long arg); static void ahc_linux_dev_timed_unfreeze(u_long arg);
static int ahc_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag); static int ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag);
static void ahc_linux_initialize_scsi_bus(struct ahc_softc *ahc); static void ahc_linux_initialize_scsi_bus(struct ahc_softc *ahc);
static void ahc_linux_thread_run_complete_queue(struct ahc_softc *ahc); static void ahc_linux_thread_run_complete_queue(struct ahc_softc *ahc);
static u_int ahc_linux_user_tagdepth(struct ahc_softc *ahc, static u_int ahc_linux_user_tagdepth(struct ahc_softc *ahc,
...@@ -512,7 +512,7 @@ ahc_linux_run_complete_queue(struct ahc_softc *ahc) ...@@ -512,7 +512,7 @@ ahc_linux_run_complete_queue(struct ahc_softc *ahc)
with_errors = 0; with_errors = 0;
while ((acmd = TAILQ_FIRST(&ahc->platform_data->completeq)) != NULL) { while ((acmd = TAILQ_FIRST(&ahc->platform_data->completeq)) != NULL) {
Scsi_Cmnd *cmd; struct scsi_cmnd *cmd;
if (with_errors > AHC_LINUX_MAX_RETURNED_ERRORS) { if (with_errors > AHC_LINUX_MAX_RETURNED_ERRORS) {
/* /*
...@@ -542,7 +542,7 @@ ahc_linux_run_complete_queue(struct ahc_softc *ahc) ...@@ -542,7 +542,7 @@ ahc_linux_run_complete_queue(struct ahc_softc *ahc)
static __inline void static __inline void
ahc_linux_unmap_scb(struct ahc_softc *ahc, struct scb *scb) ahc_linux_unmap_scb(struct ahc_softc *ahc, struct scb *scb)
{ {
Scsi_Cmnd *cmd; struct scsi_cmnd *cmd;
cmd = scb->io_ctx; cmd = scb->io_ctx;
ahc_sync_sglist(ahc, scb, BUS_DMASYNC_POSTWRITE); ahc_sync_sglist(ahc, scb, BUS_DMASYNC_POSTWRITE);
...@@ -582,27 +582,11 @@ ahc_linux_map_seg(struct ahc_softc *ahc, struct scb *scb, ...@@ -582,27 +582,11 @@ ahc_linux_map_seg(struct ahc_softc *ahc, struct scb *scb,
return (consumed); return (consumed);
} }
/************************ Host template entry points *************************/
static int ahc_linux_detect(Scsi_Host_Template *);
static int ahc_linux_queue(Scsi_Cmnd *, void (*)(Scsi_Cmnd *));
static const char *ahc_linux_info(struct Scsi_Host *);
static int ahc_linux_slave_alloc(Scsi_Device *);
static int ahc_linux_slave_configure(Scsi_Device *);
static void ahc_linux_slave_destroy(Scsi_Device *);
#if defined(__i386__)
static int ahc_linux_biosparam(struct scsi_device*,
struct block_device*,
sector_t, int[]);
#endif
static int ahc_linux_bus_reset(Scsi_Cmnd *);
static int ahc_linux_dev_reset(Scsi_Cmnd *);
static int ahc_linux_abort(Scsi_Cmnd *);
/* /*
* Try to detect an Adaptec 7XXX controller. * Try to detect an Adaptec 7XXX controller.
*/ */
static int static int
ahc_linux_detect(Scsi_Host_Template *template) ahc_linux_detect(struct scsi_host_template *template)
{ {
struct ahc_softc *ahc; struct ahc_softc *ahc;
int found = 0; int found = 0;
...@@ -683,7 +667,7 @@ ahc_linux_info(struct Scsi_Host *host) ...@@ -683,7 +667,7 @@ ahc_linux_info(struct Scsi_Host *host)
* Queue an SCB to the controller. * Queue an SCB to the controller.
*/ */
static int static int
ahc_linux_queue(Scsi_Cmnd * cmd, void (*scsi_done) (Scsi_Cmnd *)) ahc_linux_queue(struct scsi_cmnd * cmd, void (*scsi_done) (struct scsi_cmnd *))
{ {
struct ahc_softc *ahc; struct ahc_softc *ahc;
struct ahc_linux_device *dev; struct ahc_linux_device *dev;
...@@ -714,7 +698,7 @@ ahc_linux_queue(Scsi_Cmnd * cmd, void (*scsi_done) (Scsi_Cmnd *)) ...@@ -714,7 +698,7 @@ ahc_linux_queue(Scsi_Cmnd * cmd, void (*scsi_done) (Scsi_Cmnd *))
} }
static int static int
ahc_linux_slave_alloc(Scsi_Device *device) ahc_linux_slave_alloc(struct scsi_device *device)
{ {
struct ahc_softc *ahc; struct ahc_softc *ahc;
...@@ -725,7 +709,7 @@ ahc_linux_slave_alloc(Scsi_Device *device) ...@@ -725,7 +709,7 @@ ahc_linux_slave_alloc(Scsi_Device *device)
} }
static int static int
ahc_linux_slave_configure(Scsi_Device *device) ahc_linux_slave_configure(struct scsi_device *device)
{ {
struct ahc_softc *ahc; struct ahc_softc *ahc;
struct ahc_linux_device *dev; struct ahc_linux_device *dev;
...@@ -755,7 +739,7 @@ ahc_linux_slave_configure(Scsi_Device *device) ...@@ -755,7 +739,7 @@ ahc_linux_slave_configure(Scsi_Device *device)
} }
static void static void
ahc_linux_slave_destroy(Scsi_Device *device) ahc_linux_slave_destroy(struct scsi_device *device)
{ {
struct ahc_softc *ahc; struct ahc_softc *ahc;
struct ahc_linux_device *dev; struct ahc_linux_device *dev;
...@@ -836,7 +820,7 @@ ahc_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev, ...@@ -836,7 +820,7 @@ ahc_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,
* Abort the current SCSI command(s). * Abort the current SCSI command(s).
*/ */
static int static int
ahc_linux_abort(Scsi_Cmnd *cmd) ahc_linux_abort(struct scsi_cmnd *cmd)
{ {
int error; int error;
...@@ -850,7 +834,7 @@ ahc_linux_abort(Scsi_Cmnd *cmd) ...@@ -850,7 +834,7 @@ ahc_linux_abort(Scsi_Cmnd *cmd)
* Attempt to send a target reset message to the device that timed out. * Attempt to send a target reset message to the device that timed out.
*/ */
static int static int
ahc_linux_dev_reset(Scsi_Cmnd *cmd) ahc_linux_dev_reset(struct scsi_cmnd *cmd)
{ {
int error; int error;
...@@ -864,7 +848,7 @@ ahc_linux_dev_reset(Scsi_Cmnd *cmd) ...@@ -864,7 +848,7 @@ ahc_linux_dev_reset(Scsi_Cmnd *cmd)
* Reset the SCSI bus. * Reset the SCSI bus.
*/ */
static int static int
ahc_linux_bus_reset(Scsi_Cmnd *cmd) ahc_linux_bus_reset(struct scsi_cmnd *cmd)
{ {
struct ahc_softc *ahc; struct ahc_softc *ahc;
int found; int found;
...@@ -881,7 +865,7 @@ ahc_linux_bus_reset(Scsi_Cmnd *cmd) ...@@ -881,7 +865,7 @@ ahc_linux_bus_reset(Scsi_Cmnd *cmd)
return SUCCESS; return SUCCESS;
} }
Scsi_Host_Template aic7xxx_driver_template = { struct scsi_host_template aic7xxx_driver_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "aic7xxx", .name = "aic7xxx",
.proc_info = ahc_linux_proc_info, .proc_info = ahc_linux_proc_info,
...@@ -1189,7 +1173,7 @@ __setup("aic7xxx=", aic7xxx_setup); ...@@ -1189,7 +1173,7 @@ __setup("aic7xxx=", aic7xxx_setup);
uint32_t aic7xxx_verbose; uint32_t aic7xxx_verbose;
int int
ahc_linux_register_host(struct ahc_softc *ahc, Scsi_Host_Template *template) ahc_linux_register_host(struct ahc_softc *ahc, struct scsi_host_template *template)
{ {
char buf[80]; char buf[80];
struct Scsi_Host *host; struct Scsi_Host *host;
...@@ -2017,7 +2001,7 @@ ahc_send_async(struct ahc_softc *ahc, char channel, ...@@ -2017,7 +2001,7 @@ ahc_send_async(struct ahc_softc *ahc, char channel,
void void
ahc_done(struct ahc_softc *ahc, struct scb *scb) ahc_done(struct ahc_softc *ahc, struct scb *scb)
{ {
Scsi_Cmnd *cmd; struct scsi_cmnd *cmd;
struct ahc_linux_device *dev; struct ahc_linux_device *dev;
LIST_REMOVE(scb, pending_links); LIST_REMOVE(scb, pending_links);
...@@ -2171,7 +2155,7 @@ ahc_linux_handle_scsi_status(struct ahc_softc *ahc, ...@@ -2171,7 +2155,7 @@ ahc_linux_handle_scsi_status(struct ahc_softc *ahc,
case SCSI_STATUS_CHECK_COND: case SCSI_STATUS_CHECK_COND:
case SCSI_STATUS_CMD_TERMINATED: case SCSI_STATUS_CMD_TERMINATED:
{ {
Scsi_Cmnd *cmd; struct scsi_cmnd *cmd;
/* /*
* Copy sense information to the OS's cmd * Copy sense information to the OS's cmd
...@@ -2293,7 +2277,7 @@ ahc_linux_handle_scsi_status(struct ahc_softc *ahc, ...@@ -2293,7 +2277,7 @@ ahc_linux_handle_scsi_status(struct ahc_softc *ahc,
} }
static void static void
ahc_linux_queue_cmd_complete(struct ahc_softc *ahc, Scsi_Cmnd *cmd) ahc_linux_queue_cmd_complete(struct ahc_softc *ahc, struct scsi_cmnd *cmd)
{ {
/* /*
* Typically, the complete queue has very few entries * Typically, the complete queue has very few entries
...@@ -2482,7 +2466,7 @@ ahc_linux_dev_timed_unfreeze(u_long arg) ...@@ -2482,7 +2466,7 @@ ahc_linux_dev_timed_unfreeze(u_long arg)
} }
static int static int
ahc_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag) ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
{ {
struct ahc_softc *ahc; struct ahc_softc *ahc;
struct ahc_linux_device *dev; struct ahc_linux_device *dev;
......
drivers/scsi/aic7xxx/aic7xxx_osm.h
View file @ 013791ee
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
#ifndef _AIC7XXX_LINUX_H_ #ifndef _AIC7XXX_LINUX_H_
#define _AIC7XXX_LINUX_H_ #define _AIC7XXX_LINUX_H_
#include <linux/config.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -68,16 +69,19 @@ ...@@ -68,16 +69,19 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/config.h> #include <scsi/scsi.h>
#include <linux/slab.h> #include <scsi/scsi_cmnd.h>
#include <scsi/scsi_eh.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_tcq.h>
/* Core SCSI definitions */ /* Core SCSI definitions */
#define AIC_LIB_PREFIX ahc #define AIC_LIB_PREFIX ahc
#include "scsi.h"
#include <scsi/scsi_host.h>
/* Name space conflict with BSD queue macros */ /* Name space conflict with BSD queue macros */
#ifdef LIST_HEAD #ifdef LIST_HEAD
...@@ -106,7 +110,7 @@ ...@@ -106,7 +110,7 @@
/************************* Forward Declarations *******************************/ /************************* Forward Declarations *******************************/
struct ahc_softc; struct ahc_softc;
typedef struct pci_dev *ahc_dev_softc_t; typedef struct pci_dev *ahc_dev_softc_t;
typedef Scsi_Cmnd *ahc_io_ctx_t; typedef struct scsi_cmnd *ahc_io_ctx_t;
/******************************* Byte Order ***********************************/ /******************************* Byte Order ***********************************/
#define ahc_htobe16(x) cpu_to_be16(x) #define ahc_htobe16(x) cpu_to_be16(x)
...@@ -144,7 +148,7 @@ typedef Scsi_Cmnd *ahc_io_ctx_t; ...@@ -144,7 +148,7 @@ typedef Scsi_Cmnd *ahc_io_ctx_t;
extern u_int aic7xxx_no_probe; extern u_int aic7xxx_no_probe;
extern u_int aic7xxx_allow_memio; extern u_int aic7xxx_allow_memio;
extern int aic7xxx_detect_complete; extern int aic7xxx_detect_complete;
extern Scsi_Host_Template aic7xxx_driver_template; extern struct scsi_host_template aic7xxx_driver_template;
/***************************** Bus Space/DMA **********************************/ /***************************** Bus Space/DMA **********************************/
...@@ -408,7 +412,7 @@ struct ahc_linux_device { ...@@ -408,7 +412,7 @@ struct ahc_linux_device {
#define AHC_OTAG_THRESH 500 #define AHC_OTAG_THRESH 500
int lun; int lun;
Scsi_Device *scsi_device; struct scsi_device *scsi_device;
struct ahc_linux_target *target; struct ahc_linux_target *target;
}; };
...@@ -564,7 +568,7 @@ ahc_insb(struct ahc_softc * ahc, long port, uint8_t *array, int count) ...@@ -564,7 +568,7 @@ ahc_insb(struct ahc_softc * ahc, long port, uint8_t *array, int count)
/**************************** Initialization **********************************/ /**************************** Initialization **********************************/
int ahc_linux_register_host(struct ahc_softc *, int ahc_linux_register_host(struct ahc_softc *,
Scsi_Host_Template *); struct scsi_host_template *);
uint64_t ahc_linux_get_memsize(void); uint64_t ahc_linux_get_memsize(void);
...@@ -795,13 +799,13 @@ int ahc_linux_proc_info(struct Scsi_Host *, char *, char **, ...@@ -795,13 +799,13 @@ int ahc_linux_proc_info(struct Scsi_Host *, char *, char **,
/*************************** Domain Validation ********************************/ /*************************** Domain Validation ********************************/
/*********************** Transaction Access Wrappers *************************/ /*********************** Transaction Access Wrappers *************************/
static __inline void ahc_cmd_set_transaction_status(Scsi_Cmnd *, uint32_t); static __inline void ahc_cmd_set_transaction_status(struct scsi_cmnd *, uint32_t);
static __inline void ahc_set_transaction_status(struct scb *, uint32_t); static __inline void ahc_set_transaction_status(struct scb *, uint32_t);
static __inline void ahc_cmd_set_scsi_status(Scsi_Cmnd *, uint32_t); static __inline void ahc_cmd_set_scsi_status(struct scsi_cmnd *, uint32_t);
static __inline void ahc_set_scsi_status(struct scb *, uint32_t); static __inline void ahc_set_scsi_status(struct scb *, uint32_t);
static __inline uint32_t ahc_cmd_get_transaction_status(Scsi_Cmnd *cmd); static __inline uint32_t ahc_cmd_get_transaction_status(struct scsi_cmnd *cmd);
static __inline uint32_t ahc_get_transaction_status(struct scb *); static __inline uint32_t ahc_get_transaction_status(struct scb *);
static __inline uint32_t ahc_cmd_get_scsi_status(Scsi_Cmnd *cmd); static __inline uint32_t ahc_cmd_get_scsi_status(struct scsi_cmnd *cmd);
static __inline uint32_t ahc_get_scsi_status(struct scb *); static __inline uint32_t ahc_get_scsi_status(struct scb *);
static __inline void ahc_set_transaction_tag(struct scb *, int, u_int); static __inline void ahc_set_transaction_tag(struct scb *, int, u_int);
static __inline u_long ahc_get_transfer_length(struct scb *); static __inline u_long ahc_get_transfer_length(struct scb *);
...@@ -820,7 +824,7 @@ static __inline void ahc_platform_scb_free(struct ahc_softc *ahc, ...@@ -820,7 +824,7 @@ static __inline void ahc_platform_scb_free(struct ahc_softc *ahc,
static __inline void ahc_freeze_scb(struct scb *scb); static __inline void ahc_freeze_scb(struct scb *scb);
static __inline static __inline
void ahc_cmd_set_transaction_status(Scsi_Cmnd *cmd, uint32_t status) void ahc_cmd_set_transaction_status(struct scsi_cmnd *cmd, uint32_t status)
{ {
cmd->result &= ~(CAM_STATUS_MASK << 16); cmd->result &= ~(CAM_STATUS_MASK << 16);
cmd->result |= status << 16; cmd->result |= status << 16;
...@@ -833,7 +837,7 @@ void ahc_set_transaction_status(struct scb *scb, uint32_t status) ...@@ -833,7 +837,7 @@ void ahc_set_transaction_status(struct scb *scb, uint32_t status)
} }
static __inline static __inline
void ahc_cmd_set_scsi_status(Scsi_Cmnd *cmd, uint32_t status) void ahc_cmd_set_scsi_status(struct scsi_cmnd *cmd, uint32_t status)
{ {
cmd->result &= ~0xFFFF; cmd->result &= ~0xFFFF;
cmd->result |= status; cmd->result |= status;
...@@ -846,7 +850,7 @@ void ahc_set_scsi_status(struct scb *scb, uint32_t status) ...@@ -846,7 +850,7 @@ void ahc_set_scsi_status(struct scb *scb, uint32_t status)
} }
static __inline static __inline
uint32_t ahc_cmd_get_transaction_status(Scsi_Cmnd *cmd) uint32_t ahc_cmd_get_transaction_status(struct scsi_cmnd *cmd)
{ {
return ((cmd->result >> 16) & CAM_STATUS_MASK); return ((cmd->result >> 16) & CAM_STATUS_MASK);
} }
...@@ -858,7 +862,7 @@ uint32_t ahc_get_transaction_status(struct scb *scb) ...@@ -858,7 +862,7 @@ uint32_t ahc_get_transaction_status(struct scb *scb)
} }
static __inline static __inline
uint32_t ahc_cmd_get_scsi_status(Scsi_Cmnd *cmd) uint32_t ahc_cmd_get_scsi_status(struct scsi_cmnd *cmd)
{ {
return (cmd->result & 0xFFFF); return (cmd->result & 0xFFFF);
} }
......
drivers/scsi/aic7xxx/aiclib.c
View file @ 013791ee
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <linux/version.h> #include <linux/version.h>
/* Core SCSI definitions */ /* Core SCSI definitions */
#include "scsi.h"
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include "aiclib.h" #include "aiclib.h"
#include "cam.h" #include "cam.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment