diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-10-20 17:47:57 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-10-25 18:14:21 -0400 |
commit | 289fe5b1f99c5e61ed32796cbed0a1ecc3589041 (patch) | |
tree | ca2b01a48263c817ea9c190f7218c48e7c7eb9cb /drivers/scsi/aic7xxx/aic79xx.h | |
parent | 6d07cb71fdacc710fd9816cddb5c2df0f7bd96b4 (diff) |
[SCSI] aic7xxx: 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_scbs
- aic79xx_osm.c: ahd_softc_comp
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Acked-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx.h')
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx.h | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h index c58ac6a87306..b19a07cb2ab2 100644 --- a/drivers/scsi/aic7xxx/aic79xx.h +++ b/drivers/scsi/aic7xxx/aic79xx.h | |||
@@ -964,8 +964,6 @@ int ahd_read_seeprom(struct ahd_softc *ahd, uint16_t *buf, | |||
964 | 964 | ||
965 | int ahd_write_seeprom(struct ahd_softc *ahd, uint16_t *buf, | 965 | int ahd_write_seeprom(struct ahd_softc *ahd, uint16_t *buf, |
966 | u_int start_addr, u_int count); | 966 | u_int start_addr, u_int count); |
967 | int ahd_wait_seeprom(struct ahd_softc *ahd); | ||
968 | int ahd_verify_vpd_cksum(struct vpd_config *vpd); | ||
969 | int ahd_verify_cksum(struct seeprom_config *sc); | 967 | int ahd_verify_cksum(struct seeprom_config *sc); |
970 | int ahd_acquire_seeprom(struct ahd_softc *ahd); | 968 | int ahd_acquire_seeprom(struct ahd_softc *ahd); |
971 | void ahd_release_seeprom(struct ahd_softc *ahd); | 969 | void ahd_release_seeprom(struct ahd_softc *ahd); |
@@ -1312,8 +1310,6 @@ struct ahd_pci_identity { | |||
1312 | char *name; | 1310 | char *name; |
1313 | ahd_device_setup_t *setup; | 1311 | ahd_device_setup_t *setup; |
1314 | }; | 1312 | }; |
1315 | extern struct ahd_pci_identity ahd_pci_ident_table []; | ||
1316 | extern const u_int ahd_num_pci_devs; | ||
1317 | 1313 | ||
1318 | /***************************** VL/EISA Declarations ***************************/ | 1314 | /***************************** VL/EISA Declarations ***************************/ |
1319 | struct aic7770_identity { | 1315 | struct aic7770_identity { |
@@ -1331,15 +1327,6 @@ extern const int ahd_num_aic7770_devs; | |||
1331 | /*************************** Function Declarations ****************************/ | 1327 | /*************************** Function Declarations ****************************/ |
1332 | /******************************************************************************/ | 1328 | /******************************************************************************/ |
1333 | void ahd_reset_cmds_pending(struct ahd_softc *ahd); | 1329 | void ahd_reset_cmds_pending(struct ahd_softc *ahd); |
1334 | u_int ahd_find_busy_tcl(struct ahd_softc *ahd, u_int tcl); | ||
1335 | void ahd_busy_tcl(struct ahd_softc *ahd, | ||
1336 | u_int tcl, u_int busyid); | ||
1337 | static __inline void ahd_unbusy_tcl(struct ahd_softc *ahd, u_int tcl); | ||
1338 | static __inline void | ||
1339 | ahd_unbusy_tcl(struct ahd_softc *ahd, u_int tcl) | ||
1340 | { | ||
1341 | ahd_busy_tcl(ahd, tcl, SCB_LIST_NULL); | ||
1342 | } | ||
1343 | 1330 | ||
1344 | /***************************** PCI Front End *********************************/ | 1331 | /***************************** PCI Front End *********************************/ |
1345 | struct ahd_pci_identity *ahd_find_pci_device(ahd_dev_softc_t); | 1332 | struct ahd_pci_identity *ahd_find_pci_device(ahd_dev_softc_t); |
@@ -1348,7 +1335,6 @@ int ahd_pci_config(struct ahd_softc *, | |||
1348 | int ahd_pci_test_register_access(struct ahd_softc *); | 1335 | int ahd_pci_test_register_access(struct ahd_softc *); |
1349 | 1336 | ||
1350 | /************************** SCB and SCB queue management **********************/ | 1337 | /************************** SCB and SCB queue management **********************/ |
1351 | int ahd_probe_scbs(struct ahd_softc *); | ||
1352 | void ahd_qinfifo_requeue_tail(struct ahd_softc *ahd, | 1338 | void ahd_qinfifo_requeue_tail(struct ahd_softc *ahd, |
1353 | struct scb *scb); | 1339 | struct scb *scb); |
1354 | int ahd_match_scb(struct ahd_softc *ahd, struct scb *scb, | 1340 | int ahd_match_scb(struct ahd_softc *ahd, struct scb *scb, |
@@ -1366,33 +1352,20 @@ int ahd_parse_vpddata(struct ahd_softc *ahd, | |||
1366 | int ahd_parse_cfgdata(struct ahd_softc *ahd, | 1352 | int ahd_parse_cfgdata(struct ahd_softc *ahd, |
1367 | struct seeprom_config *sc); | 1353 | struct seeprom_config *sc); |
1368 | void ahd_intr_enable(struct ahd_softc *ahd, int enable); | 1354 | void ahd_intr_enable(struct ahd_softc *ahd, int enable); |
1369 | void ahd_update_coalescing_values(struct ahd_softc *ahd, | ||
1370 | u_int timer, | ||
1371 | u_int maxcmds, | ||
1372 | u_int mincmds); | ||
1373 | void ahd_enable_coalescing(struct ahd_softc *ahd, | ||
1374 | int enable); | ||
1375 | void ahd_pause_and_flushwork(struct ahd_softc *ahd); | 1355 | void ahd_pause_and_flushwork(struct ahd_softc *ahd); |
1376 | int ahd_suspend(struct ahd_softc *ahd); | 1356 | int ahd_suspend(struct ahd_softc *ahd); |
1377 | int ahd_resume(struct ahd_softc *ahd); | ||
1378 | void ahd_set_unit(struct ahd_softc *, int); | 1357 | void ahd_set_unit(struct ahd_softc *, int); |
1379 | void ahd_set_name(struct ahd_softc *, char *); | 1358 | void ahd_set_name(struct ahd_softc *, char *); |
1380 | struct scb *ahd_get_scb(struct ahd_softc *ahd, u_int col_idx); | 1359 | struct scb *ahd_get_scb(struct ahd_softc *ahd, u_int col_idx); |
1381 | void ahd_free_scb(struct ahd_softc *ahd, struct scb *scb); | 1360 | void ahd_free_scb(struct ahd_softc *ahd, struct scb *scb); |
1382 | void ahd_alloc_scbs(struct ahd_softc *ahd); | ||
1383 | void ahd_free(struct ahd_softc *ahd); | 1361 | void ahd_free(struct ahd_softc *ahd); |
1384 | int ahd_reset(struct ahd_softc *ahd, int reinit); | 1362 | int ahd_reset(struct ahd_softc *ahd, int reinit); |
1385 | void ahd_shutdown(void *arg); | ||
1386 | int ahd_write_flexport(struct ahd_softc *ahd, | 1363 | int ahd_write_flexport(struct ahd_softc *ahd, |
1387 | u_int addr, u_int value); | 1364 | u_int addr, u_int value); |
1388 | int ahd_read_flexport(struct ahd_softc *ahd, u_int addr, | 1365 | int ahd_read_flexport(struct ahd_softc *ahd, u_int addr, |
1389 | uint8_t *value); | 1366 | uint8_t *value); |
1390 | int ahd_wait_flexport(struct ahd_softc *ahd); | ||
1391 | 1367 | ||
1392 | /*************************** Interrupt Services *******************************/ | 1368 | /*************************** Interrupt Services *******************************/ |
1393 | void ahd_pci_intr(struct ahd_softc *ahd); | ||
1394 | void ahd_clear_intstat(struct ahd_softc *ahd); | ||
1395 | void ahd_flush_qoutfifo(struct ahd_softc *ahd); | ||
1396 | void ahd_run_qoutfifo(struct ahd_softc *ahd); | 1369 | void ahd_run_qoutfifo(struct ahd_softc *ahd); |
1397 | #ifdef AHD_TARGET_MODE | 1370 | #ifdef AHD_TARGET_MODE |
1398 | void ahd_run_tqinfifo(struct ahd_softc *ahd, int paused); | 1371 | void ahd_run_tqinfifo(struct ahd_softc *ahd, int paused); |
@@ -1401,7 +1374,6 @@ void ahd_handle_hwerrint(struct ahd_softc *ahd); | |||
1401 | void ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat); | 1374 | void ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat); |
1402 | void ahd_handle_scsiint(struct ahd_softc *ahd, | 1375 | void ahd_handle_scsiint(struct ahd_softc *ahd, |
1403 | u_int intstat); | 1376 | u_int intstat); |
1404 | void ahd_clear_critical_section(struct ahd_softc *ahd); | ||
1405 | 1377 | ||
1406 | /***************************** Error Recovery *********************************/ | 1378 | /***************************** Error Recovery *********************************/ |
1407 | typedef enum { | 1379 | typedef enum { |
@@ -1418,23 +1390,9 @@ int ahd_search_disc_list(struct ahd_softc *ahd, int target, | |||
1418 | char channel, int lun, u_int tag, | 1390 | char channel, int lun, u_int tag, |
1419 | int stop_on_first, int remove, | 1391 | int stop_on_first, int remove, |
1420 | int save_state); | 1392 | int save_state); |
1421 | void ahd_freeze_devq(struct ahd_softc *ahd, struct scb *scb); | ||
1422 | int ahd_reset_channel(struct ahd_softc *ahd, char channel, | 1393 | int ahd_reset_channel(struct ahd_softc *ahd, char channel, |
1423 | int initiate_reset); | 1394 | int initiate_reset); |
1424 | int ahd_abort_scbs(struct ahd_softc *ahd, int target, | ||
1425 | char channel, int lun, u_int tag, | ||
1426 | role_t role, uint32_t status); | ||
1427 | void ahd_restart(struct ahd_softc *ahd); | ||
1428 | void ahd_clear_fifo(struct ahd_softc *ahd, u_int fifo); | ||
1429 | void ahd_handle_scb_status(struct ahd_softc *ahd, | ||
1430 | struct scb *scb); | ||
1431 | void ahd_handle_scsi_status(struct ahd_softc *ahd, | ||
1432 | struct scb *scb); | ||
1433 | void ahd_calc_residual(struct ahd_softc *ahd, | ||
1434 | struct scb *scb); | ||
1435 | /*************************** Utility Functions ********************************/ | 1395 | /*************************** Utility Functions ********************************/ |
1436 | struct ahd_phase_table_entry* | ||
1437 | ahd_lookup_phase_entry(int phase); | ||
1438 | void ahd_compile_devinfo(struct ahd_devinfo *devinfo, | 1396 | void ahd_compile_devinfo(struct ahd_devinfo *devinfo, |
1439 | u_int our_id, u_int target, | 1397 | u_int our_id, u_int target, |
1440 | u_int lun, char channel, | 1398 | u_int lun, char channel, |
@@ -1442,14 +1400,6 @@ void ahd_compile_devinfo(struct ahd_devinfo *devinfo, | |||
1442 | /************************** Transfer Negotiation ******************************/ | 1400 | /************************** Transfer Negotiation ******************************/ |
1443 | void ahd_find_syncrate(struct ahd_softc *ahd, u_int *period, | 1401 | void ahd_find_syncrate(struct ahd_softc *ahd, u_int *period, |
1444 | u_int *ppr_options, u_int maxsync); | 1402 | u_int *ppr_options, u_int maxsync); |
1445 | void ahd_validate_offset(struct ahd_softc *ahd, | ||
1446 | struct ahd_initiator_tinfo *tinfo, | ||
1447 | u_int period, u_int *offset, | ||
1448 | int wide, role_t role); | ||
1449 | void ahd_validate_width(struct ahd_softc *ahd, | ||
1450 | struct ahd_initiator_tinfo *tinfo, | ||
1451 | u_int *bus_width, | ||
1452 | role_t role); | ||
1453 | /* | 1403 | /* |
1454 | * Negotiation types. These are used to qualify if we should renegotiate | 1404 | * Negotiation types. These are used to qualify if we should renegotiate |
1455 | * even if our goal and current transport parameters are identical. | 1405 | * even if our goal and current transport parameters are identical. |
@@ -1520,10 +1470,8 @@ extern uint32_t ahd_debug; | |||
1520 | #define AHD_SHOW_INT_COALESCING 0x10000 | 1470 | #define AHD_SHOW_INT_COALESCING 0x10000 |
1521 | #define AHD_DEBUG_SEQUENCER 0x20000 | 1471 | #define AHD_DEBUG_SEQUENCER 0x20000 |
1522 | #endif | 1472 | #endif |
1523 | void ahd_print_scb(struct scb *scb); | ||
1524 | void ahd_print_devinfo(struct ahd_softc *ahd, | 1473 | void ahd_print_devinfo(struct ahd_softc *ahd, |
1525 | struct ahd_devinfo *devinfo); | 1474 | struct ahd_devinfo *devinfo); |
1526 | void ahd_dump_sglist(struct scb *scb); | ||
1527 | void ahd_dump_card_state(struct ahd_softc *ahd); | 1475 | void ahd_dump_card_state(struct ahd_softc *ahd); |
1528 | int ahd_print_register(ahd_reg_parse_entry_t *table, | 1476 | int ahd_print_register(ahd_reg_parse_entry_t *table, |
1529 | u_int num_entries, | 1477 | u_int num_entries, |
@@ -1532,5 +1480,4 @@ int ahd_print_register(ahd_reg_parse_entry_t *table, | |||
1532 | u_int value, | 1480 | u_int value, |
1533 | u_int *cur_column, | 1481 | u_int *cur_column, |
1534 | u_int wrap_point); | 1482 | u_int wrap_point); |
1535 | void ahd_dump_scbs(struct ahd_softc *ahd); | ||
1536 | #endif /* _AIC79XX_H_ */ | 1483 | #endif /* _AIC79XX_H_ */ |