diff options
| author | Adrian Bunk <bunk@stusta.de> | 2005-06-21 04:47:06 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 00:19:53 -0400 |
| commit | 7aa55fcec236daed20dd362c99229184691d0e7f (patch) | |
| tree | 2abf60107b4cecf1403c681dc75570cc48e99529 /drivers/net/skfp/h | |
| parent | 9b25978ef8ebe010f582489117f8a7a43a6b44a3 (diff) | |
[PATCH] drivers/net/skfp/: cleanups
This patch contains the following cleanups:
- make needlessly global code static
- remove the completely unused smtparse.c
- remove the following unused global functions:
- drvfbi.c: init_dma
- drvfbi.c: dis_dma
- drvfbi.c: get_rom_byte
- drvfbi.c: mac_drv_vpd_read
- drvfbi.c: mac_drv_pci_fix
- fplustm.c: mac_set_func_addr
- fplustm.c: mac_del_multicast
- hwmtm.c: mac_drv_rx_frag
- pcmplc.c: pcm_set_lct_short
- smt.c: smt_please_reconnect
- smt.c: smt_change_t_neg
- smtdef.c: smt_set_defaults
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'drivers/net/skfp/h')
| -rw-r--r-- | drivers/net/skfp/h/cmtdef.h | 7 | ||||
| -rw-r--r-- | drivers/net/skfp/h/hwmtm.h | 25 |
2 files changed, 0 insertions, 32 deletions
diff --git a/drivers/net/skfp/h/cmtdef.h b/drivers/net/skfp/h/cmtdef.h index 603982debc71..f2f771d8be76 100644 --- a/drivers/net/skfp/h/cmtdef.h +++ b/drivers/net/skfp/h/cmtdef.h | |||
| @@ -507,7 +507,6 @@ void pcm_status_state(struct s_smc *smc, int np, int *type, int *state, | |||
| 507 | int *remote, int *mac); | 507 | int *remote, int *mac); |
| 508 | void plc_config_mux(struct s_smc *smc, int mux); | 508 | void plc_config_mux(struct s_smc *smc, int mux); |
| 509 | void sm_lem_evaluate(struct s_smc *smc); | 509 | void sm_lem_evaluate(struct s_smc *smc); |
| 510 | void smt_clear_una_dna(struct s_smc *smc); | ||
| 511 | void mac_update_counter(struct s_smc *smc); | 510 | void mac_update_counter(struct s_smc *smc); |
| 512 | void sm_pm_ls_latch(struct s_smc *smc, int phy, int on_off); | 511 | void sm_pm_ls_latch(struct s_smc *smc, int phy, int on_off); |
| 513 | void sm_ma_control(struct s_smc *smc, int mode); | 512 | void sm_ma_control(struct s_smc *smc, int mode); |
| @@ -541,11 +540,9 @@ void smt_timer_poll(struct s_smc *smc); | |||
| 541 | u_long smt_get_time(void); | 540 | u_long smt_get_time(void); |
| 542 | u_long smt_get_tid(struct s_smc *smc); | 541 | u_long smt_get_tid(struct s_smc *smc); |
| 543 | void smt_timer_done(struct s_smc *smc); | 542 | void smt_timer_done(struct s_smc *smc); |
| 544 | void smt_set_defaults(struct s_smc *smc); | ||
| 545 | void smt_fixup_mib(struct s_smc *smc); | 543 | void smt_fixup_mib(struct s_smc *smc); |
| 546 | void smt_reset_defaults(struct s_smc *smc, int level); | 544 | void smt_reset_defaults(struct s_smc *smc, int level); |
| 547 | void smt_agent_task(struct s_smc *smc); | 545 | void smt_agent_task(struct s_smc *smc); |
| 548 | void smt_please_reconnect(struct s_smc *smc, int reconn_time); | ||
| 549 | int smt_check_para(struct s_smc *smc, struct smt_header *sm, | 546 | int smt_check_para(struct s_smc *smc, struct smt_header *sm, |
| 550 | const u_short list[]); | 547 | const u_short list[]); |
| 551 | void driver_get_bia(struct s_smc *smc, struct fddi_addr *bia_addr); | 548 | void driver_get_bia(struct s_smc *smc, struct fddi_addr *bia_addr); |
| @@ -568,7 +565,6 @@ int pcm_get_s_port(struct s_smc *smc); | |||
| 568 | int pcm_rooted_station(struct s_smc *smc); | 565 | int pcm_rooted_station(struct s_smc *smc); |
| 569 | int cfm_get_mac_input(struct s_smc *smc); | 566 | int cfm_get_mac_input(struct s_smc *smc); |
| 570 | int cfm_get_mac_output(struct s_smc *smc); | 567 | int cfm_get_mac_output(struct s_smc *smc); |
| 571 | int port_to_mib(struct s_smc *smc, int p); | ||
| 572 | int cem_build_path(struct s_smc *smc, char *to, int path_index); | 568 | int cem_build_path(struct s_smc *smc, char *to, int path_index); |
| 573 | int sm_mac_get_tx_state(struct s_smc *smc); | 569 | int sm_mac_get_tx_state(struct s_smc *smc); |
| 574 | char *get_pcmstate(struct s_smc *smc, int np); | 570 | char *get_pcmstate(struct s_smc *smc, int np); |
| @@ -580,8 +576,6 @@ void smt_send_frame(struct s_smc *smc, SMbuf *mb, int fc, int local); | |||
| 580 | void smt_set_timestamp(struct s_smc *smc, u_char *p); | 576 | void smt_set_timestamp(struct s_smc *smc, u_char *p); |
| 581 | void mac_set_rx_mode(struct s_smc *smc, int mode); | 577 | void mac_set_rx_mode(struct s_smc *smc, int mode); |
| 582 | int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can); | 578 | int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can); |
| 583 | int mac_set_func_addr(struct s_smc *smc, u_long f_addr); | ||
| 584 | void mac_del_multicast(struct s_smc *smc, struct fddi_addr *addr, int can); | ||
| 585 | void mac_update_multicast(struct s_smc *smc); | 579 | void mac_update_multicast(struct s_smc *smc); |
| 586 | void mac_clear_multicast(struct s_smc *smc); | 580 | void mac_clear_multicast(struct s_smc *smc); |
| 587 | void set_formac_tsync(struct s_smc *smc, long sync_bw); | 581 | void set_formac_tsync(struct s_smc *smc, long sync_bw); |
| @@ -599,7 +593,6 @@ void plc_irq(struct s_smc *smc, int np, unsigned int cmd); | |||
| 599 | int smt_set_mac_opvalues(struct s_smc *smc); | 593 | int smt_set_mac_opvalues(struct s_smc *smc); |
| 600 | 594 | ||
| 601 | #ifdef TAG_MODE | 595 | #ifdef TAG_MODE |
| 602 | void mac_drv_pci_fix(struct s_smc *smc, u_long fix_value); | ||
| 603 | void mac_do_pci_fix(struct s_smc *smc); | 596 | void mac_do_pci_fix(struct s_smc *smc); |
| 604 | void mac_drv_clear_tx_queue(struct s_smc *smc); | 597 | void mac_drv_clear_tx_queue(struct s_smc *smc); |
| 605 | void mac_drv_repair_descr(struct s_smc *smc); | 598 | void mac_drv_repair_descr(struct s_smc *smc); |
diff --git a/drivers/net/skfp/h/hwmtm.h b/drivers/net/skfp/h/hwmtm.h index 4e360af07d77..1a606d4bfe5e 100644 --- a/drivers/net/skfp/h/hwmtm.h +++ b/drivers/net/skfp/h/hwmtm.h | |||
| @@ -262,31 +262,6 @@ struct os_debug { | |||
| 262 | (smc)->hw.fp.tx_q[queue].tx_curr_put | 262 | (smc)->hw.fp.tx_q[queue].tx_curr_put |
| 263 | 263 | ||
| 264 | /* | 264 | /* |
| 265 | * BEGIN_MANUAL_ENTRY(HWM_TX_CHECK) | ||
| 266 | * void HWM_TX_CHECK(smc,frame_status,low_water) | ||
| 267 | * | ||
| 268 | * function MACRO (hardware module, hwmtm.h) | ||
| 269 | * This macro is invoked by the OS-specific before it left it's | ||
| 270 | * driver_send function. This macro calls mac_drv_clear_txd | ||
| 271 | * if the free TxDs of the current transmit queue is equal or | ||
| 272 | * lower than the given low water mark. | ||
| 273 | * | ||
| 274 | * para frame_status status of the frame, see design description | ||
| 275 | * low_water low water mark of free TxD's | ||
| 276 | * | ||
| 277 | * END_MANUAL_ENTRY | ||
| 278 | */ | ||
| 279 | #ifndef HWM_NO_FLOW_CTL | ||
| 280 | #define HWM_TX_CHECK(smc,frame_status,low_water) {\ | ||
| 281 | if ((low_water)>=(smc)->hw.fp.tx_q[(frame_status)&QUEUE_A0].tx_free) {\ | ||
| 282 | mac_drv_clear_txd(smc) ;\ | ||
| 283 | }\ | ||
| 284 | } | ||
| 285 | #else | ||
| 286 | #define HWM_TX_CHECK(smc,frame_status,low_water) mac_drv_clear_txd(smc) | ||
| 287 | #endif | ||
| 288 | |||
| 289 | /* | ||
| 290 | * BEGIN_MANUAL_ENTRY(HWM_GET_RX_FRAG_LEN) | 265 | * BEGIN_MANUAL_ENTRY(HWM_GET_RX_FRAG_LEN) |
| 291 | * int HWM_GET_RX_FRAG_LEN(rxd) | 266 | * int HWM_GET_RX_FRAG_LEN(rxd) |
| 292 | * | 267 | * |
