drivers/scsi/aic7xxx/: possible cleanups
Subsystems (2)
PATCH 1/1 drivers/scsi/aic7xxx/: possible cleanups
This patch contains the following possible cleanups:
- make needlessly global code static
- #if 0 the following unused global functions:
- aic79xx_core.c: ahd_print_scb
- aic79xx_core.c: ahd_suspend
- aic79xx_core.c: ahd_resume
- aic79xx_core.c: ahd_dump_all_cards_state
- aic79xx_core.c: ahd_dump_scbs
Signed-off-by Adrian Bunk <[email protected]>
---
drivers/scsi/aic7xxx/aic79xx.h | 49 ------ drivers/scsi/aic7xxx/aic79xx_core.c | 180 +++++++++++++++++-------- drivers/scsi/aic7xxx/aic79xx_inline.h | 30 ---- drivers/scsi/aic7xxx/aic79xx_osm.c | 2 drivers/scsi/aic7xxx/aic79xx_osm.h | 2 drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 2 drivers/scsi/aic7xxx/aic79xx_pci.c | 7 drivers/scsi/aic7xxx/aic7xxx.h | 2 drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 drivers/scsi/aic7xxx/aic7xxx_osm.h | 2 drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 2 drivers/scsi/aic7xxx/aic7xxx_pci.c | 4 12 files changed, 136 insertions(+), 148 deletions(-)
drivers/scsi/aic7xxx/aic79xx.h renamed from drivers/scsi/aic7xxx/aic79xx.h.old +0 -49
@@ -974,8 +974,6 @@int ahd_write_seeprom (struct ahd_softc *ahd,uint16_t *buf,u_int start_addr,u_int count); -int ahd_wait_seeprom (struct ahd_softc *ahd); -int ahd_verify_vpd_cksum (struct vpd_config *vpd);int ahd_verify_cksum (struct seeprom_config *sc);int ahd_acquire_seeprom (struct ahd_softc *ahd);void ahd_release_seeprom (struct ahd_softc *ahd);
@@ -1311,8 +1309,6 @@char *name;ahd_device_setup_t *setup; }; -extern struct ahd_pci_identity ahd_pci_ident_table []; -extern const u_int ahd_num_pci_devs;/***************************** VL/EISA Declarations ***************************/ struct aic7770_identity {
@@ -1330,15 +1326,6 @@/*************************** Function Declarations ****************************/ /******************************************************************************/ void ahd_reset_cmds_pending (struct ahd_softc *ahd); -u_int ahd_find_busy_tcl (struct ahd_softc *ahd,u_int tcl); -void ahd_busy_tcl (struct ahd_softc *ahd, -u_int tcl,u_int busyid); -static __inlinevoid ahd_unbusy_tcl (struct ahd_softc *ahd,u_int tcl); -static __inlinevoid -ahd_unbusy_tcl (struct ahd_softc *ahd,u_int tcl) -{ -ahd_busy_tcl (ahd, tcl,SCB_LIST_NULL ); -}/***************************** PCI Front End *********************************/ struct ahd_pci_identity *ahd_find_pci_device (ahd_dev_softc_t );
@@ -1347,12 +1334,8 @@int ahd_pci_test_register_access (struct ahd_softc *);/************************** SCB and SCB queue management **********************/ -int ahd_probe_scbs (struct ahd_softc *);void ahd_qinfifo_requeue_tail (struct ahd_softc *ahd,struct scb *scb); -int ahd_match_scb (struct ahd_softc *ahd,struct scb *scb, -int target,char channel,int lun, -u_int tag,role_t role);/****************************** Initialization ********************************/ struct ahd_softc *ahd_alloc (void *platform_arg,char *name);
@@ -1365,35 +1348,22 @@int ahd_parse_cfgdata (struct ahd_softc *ahd,struct seeprom_config *sc);void ahd_intr_enable (struct ahd_softc *ahd,int enable); -void ahd_update_coalescing_values (struct ahd_softc *ahd, -u_int timer, -u_int maxcmds, -u_int mincmds); -void ahd_enable_coalescing (struct ahd_softc *ahd, -int enable);void ahd_pause_and_flushwork (struct ahd_softc *ahd);int ahd_suspend (struct ahd_softc *ahd); -int ahd_resume (struct ahd_softc *ahd);void ahd_softc_insert (struct ahd_softc *);struct ahd_softc *ahd_find_softc (struct ahd_softc *ahd);void ahd_set_unit (struct ahd_softc *,int );void ahd_set_name (struct ahd_softc *,char *);struct scb *ahd_get_scb (struct ahd_softc *ahd,u_int col_idx);void ahd_free_scb (struct ahd_softc *ahd,struct scb *scb); -void ahd_alloc_scbs (struct ahd_softc *ahd);void ahd_free (struct ahd_softc *ahd);int ahd_reset (struct ahd_softc *ahd,int reinit); -void ahd_shutdown (void *arg);int ahd_write_flexport (struct ahd_softc *ahd,u_int addr,u_int value);int ahd_read_flexport (struct ahd_softc *ahd,u_int addr,uint8_t *value); -int ahd_wait_flexport (struct ahd_softc *ahd);/*************************** Interrupt Services *******************************/ -void ahd_pci_intr (struct ahd_softc *ahd); -void ahd_clear_intstat (struct ahd_softc *ahd); -void ahd_flush_qoutfifo (struct ahd_softc *ahd);void ahd_run_qoutfifo (struct ahd_softc *ahd);#ifdef AHD_TARGET_MODE void ahd_run_tqinfifo (struct ahd_softc *ahd,int paused);
@@ -1402,7 +1372,6 @@void ahd_handle_seqint (struct ahd_softc *ahd,u_int intstat);void ahd_handle_scsiint (struct ahd_softc *ahd,u_int intstat); -void ahd_clear_critical_section (struct ahd_softc *ahd);/***************************** Error Recovery *********************************/ typedef enum {
@@ -1419,23 +1388,9 @@ char channel, int lun, u_int tag, int stop_on_first, int remove, int save_state); -void ahd_freeze_devq (struct ahd_softc *ahd,struct scb *scb);int ahd_reset_channel (struct ahd_softc *ahd,char channel,int initiate_reset); -int ahd_abort_scbs (struct ahd_softc *ahd,int target, -char channel,int lun,u_int tag, -role_t role,uint32_t status); -void ahd_restart (struct ahd_softc *ahd); -void ahd_clear_fifo (struct ahd_softc *ahd,u_int fifo); -void ahd_handle_scb_status (struct ahd_softc *ahd, -struct scb *scb); -void ahd_handle_scsi_status (struct ahd_softc *ahd, -struct scb *scb); -void ahd_calc_residual (struct ahd_softc *ahd, -struct scb *scb);/*************************** Utility Functions ********************************/ -struct ahd_phase_table_entry * -ahd_lookup_phase_entry (int phase); void ahd_compile_devinfo(struct ahd_devinfo *devinfo, u_int our_id, u_int target, u_int lun, char channel,
@@ -1520,11 +1475,8 @@#define AHD_SHOW_INT_COALESCING 0x10000#define AHD_DEBUG_SEQUENCER 0x20000#endif -void ahd_print_scb (struct scb *scb);void ahd_print_devinfo (struct ahd_softc *ahd,struct ahd_devinfo *devinfo); -void ahd_dump_sglist (struct scb *scb); -void ahd_dump_all_cards_state (void );void ahd_dump_card_state (struct ahd_softc *ahd); int ahd_print_register(ahd_reg_parse_entry_t *table, u_int num_entries,
@@ -1533,5 +1485,4 @@u_int value, u_int *cur_column, u_int wrap_point); -void ahd_dump_scbs (struct ahd_softc *ahd);#endif /* _AIC79XX_H_ */
drivers/scsi/aic7xxx/aic79xx_inline.h renamed from drivers/scsi/aic7xxx/aic79xx_inline.h.old +0 -30
@@ -418,10 +418,6 @@ }/*********************** Miscelaneous Support Functions ***********************/ -static __inlinevoid ahd_complete_scb (struct ahd_softc *ahd, -struct scb *scb); -static __inlinevoid ahd_update_residual (struct ahd_softc *ahd, -struct scb *scb);static __inlinestruct ahd_initiator_tinfo * ahd_fetch_transinfo(struct ahd_softc *ahd, char channel, u_int our_id,
@@ -467,32 +463,6 @@ ahd_get_sense_bufaddr(struct ahd_softc *ahd, struct scb *scb); -static __inlinevoid -ahd_complete_scb (struct ahd_softc *ahd,struct scb *scb) -{ -uint32_t sgptr; - - sgptr =ahd_le32toh (scb->hscb->sgptr); -if ((sgptr &SG_STATUS_VALID ) !=0 ) -ahd_handle_scb_status (ahd, scb); -else -ahd_done (ahd, scb); -} - -/* -* Determine whether the sequencer reported a residual -* for this SCB/transaction. -*/ -static __inlinevoid -ahd_update_residual (struct ahd_softc *ahd,struct scb *scb) -{ -uint32_t sgptr; - - sgptr =ahd_le32toh (scb->hscb->sgptr); -if ((sgptr &SG_STATUS_VALID ) !=0 ) -ahd_calc_residual (ahd, scb); -} -/* * Return pointers to the transfer negotiation information * for the specified our_id/remote_id pair.
drivers/scsi/aic7xxx/aic79xx_core.c renamed from drivers/scsi/aic7xxx/aic79xx_core.c.old +126 -54
395 lines not on this page · raw message
drivers/scsi/aic7xxx/aic79xx_osm.h renamed from drivers/scsi/aic7xxx/aic79xx_osm.h.old +0 -2
@@ -837,8 +837,6 @@#define PCIXM_STATUS_MAXCRDS 0x1C00/* Maximum Cumulative Read Size */ #define PCIXM_STATUS_RCVDSCEM 0x2000/* Received a Split Comp w/Error msg */ -extern struct pci_driver aic79xx_pci_driver; - typedef enum { AHD_POWER_STATE_D0,
drivers/scsi/aic7xxx/aic79xx_osm_pci.c renamed from drivers/scsi/aic7xxx/aic79xx_osm_pci.c.old +1 -1
@@ -82,7 +82,7 @@MODULE_DEVICE_TABLE (pci, ahd_linux_pci_id_table); -struct pci_driver aic79xx_pci_driver = { +static struct pci_driver aic79xx_pci_driver = { .name ="aic79xx" , .probe = ahd_linux_pci_dev_probe, .remove = ahd_linux_pci_dev_remove,
drivers/scsi/aic7xxx/aic79xx_pci.c renamed from drivers/scsi/aic7xxx/aic79xx_pci.c.old +4 -3
@@ -99,7 +99,7 @@static ahd_device_setup_t ahd_aic7902_setup;static ahd_device_setup_t ahd_aic790X_setup; -struct ahd_pci_identity ahd_pci_ident_table [] = +static struct ahd_pci_identity ahd_pci_ident_table [] = {/* aic7901 based controllers */ {
@@ -196,7 +196,7 @@ } }; -const u_int ahd_num_pci_devs =NUM_ELEMENTS (ahd_pci_ident_table); +static const u_int ahd_num_pci_devs =NUM_ELEMENTS (ahd_pci_ident_table);#define DEVCONFIG 0x40#define PCIXINITPAT 0x0000E000ul
@@ -240,6 +240,7 @@static void ahd_configure_termination (struct ahd_softc *ahd,u_int adapter_control);static void ahd_pci_split_intr (struct ahd_softc *ahd,u_int intstat); +static void ahd_pci_intr (struct ahd_softc *ahd);struct ahd_pci_identity *ahd_find_pci_device (ahd_dev_softc_t pci)
@@ -759,7 +760,7 @@ "%s: Address or Write Phase Parity Error Detected in %s.\n" }; -void +static void ahd_pci_intr (struct ahd_softc *ahd) {uint8_t pci_status[8 ];
drivers/scsi/aic7xxx/aic79xx_osm.c renamed from drivers/scsi/aic7xxx/aic79xx_osm.c.old +1 -1
@@ -401,7 +401,7 @@* force all outstanding transactions to be serviced prior to a new * transaction. */ -uint32_t aic79xx_periodic_otag; +static uint32_t aic79xx_periodic_otag;/* * Module information and settable options.
drivers/scsi/aic7xxx/aic7xxx_osm.c renamed from drivers/scsi/aic7xxx/aic7xxx_osm.c.old +1 -1
@@ -421,7 +421,7 @@* force all outstanding transactions to be serviced prior to a new * transaction. */ -uint32_t aic7xxx_periodic_otag; +static uint32_t aic7xxx_periodic_otag;/* * Module information and settable options.
drivers/scsi/aic7xxx/aic7xxx_osm.h renamed from drivers/scsi/aic7xxx/aic7xxx_osm.h.old +0 -2
@@ -797,8 +797,6 @@#define PCIR_SUBVEND_0 0x2c#define PCIR_SUBDEV_0 0x2e -extern struct pci_driver aic7xxx_pci_driver; - typedef enum { AHC_POWER_STATE_D0,
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c renamed from drivers/scsi/aic7xxx/aic7xxx_osm_pci.c.old +1 -1
@@ -130,7 +130,7 @@MODULE_DEVICE_TABLE (pci, ahc_linux_pci_id_table); -struct pci_driver aic7xxx_pci_driver = { +static struct pci_driver aic7xxx_pci_driver = { .name ="aic7xxx" , .probe = ahc_linux_pci_dev_probe, .remove = ahc_linux_pci_dev_remove,
drivers/scsi/aic7xxx/aic7xxx.h renamed from drivers/scsi/aic7xxx/aic7xxx.h.old +0 -2
@@ -1143,8 +1143,6 @@char *name;ahc_device_setup_t *setup; }; -extern struct ahc_pci_identity ahc_pci_ident_table[]; -extern const u_int ahc_num_pci_devs;/***************************** VL/EISA Declarations ***************************/ struct aic7770_identity {
drivers/scsi/aic7xxx/aic7xxx_pci.c renamed from drivers/scsi/aic7xxx/aic7xxx_pci.c.old +2 -2
@@ -164,7 +164,7 @@static ahc_device_setup_t ahc_aha494XX_setup;static ahc_device_setup_t ahc_aha398XX_setup; -struct ahc_pci_identity ahc_pci_ident_table [] = +static struct ahc_pci_identity ahc_pci_ident_table [] = {/* aic7850 based controllers */ {
@@ -549,7 +549,7 @@ } }; -const u_int ahc_num_pci_devs =NUM_ELEMENTS (ahc_pci_ident_table); +static const u_int ahc_num_pci_devs =NUM_ELEMENTS (ahc_pci_ident_table);#define AHC_394X_SLOT_CHANNEL_A 4#define AHC_394X_SLOT_CHANNEL_B 5