From: Adrian Bunk The patch below makes the following changes under drivers/atm/ : - make some needlessly global things static - #if 0 an unneeded global function in nicstarmac.c Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- 25-akpm/drivers/atm/ambassador.c | 4 +-- 25-akpm/drivers/atm/atmtcp.c | 6 ++--- 25-akpm/drivers/atm/firestream.c | 12 +++++----- 25-akpm/drivers/atm/he.c | 44 ++++++++++++++++++++++++++++++++++++++- 25-akpm/drivers/atm/he.h | 43 -------------------------------------- 25-akpm/drivers/atm/idt77105.c | 2 - 25-akpm/drivers/atm/idt77105.h | 1 25-akpm/drivers/atm/idt77252.h | 2 - 25-akpm/drivers/atm/iphase.c | 17 ++++++--------- 25-akpm/drivers/atm/iphase.h | 4 --- 25-akpm/drivers/atm/nicstarmac.c | 5 +++- 25-akpm/drivers/atm/nicstarmac.h | 1 12 files changed, 67 insertions(+), 74 deletions(-) diff -puN drivers/atm/ambassador.c~small-drivers-atm-cleanups drivers/atm/ambassador.c --- 25/drivers/atm/ambassador.c~small-drivers-atm-cleanups 2004-12-01 23:42:29.794904648 -0800 +++ 25-akpm/drivers/atm/ambassador.c 2004-12-01 23:42:29.816901304 -0800 @@ -1692,7 +1692,7 @@ static unsigned int command_timeouts [] }; -unsigned int command_successes [] = { +static unsigned int command_successes [] = { [host_memory_test] = COMMAND_PASSED_TEST, [read_adapter_memory] = COMMAND_READ_DATA_OK, [write_adapter_memory] = COMMAND_WRITE_DATA_OK, @@ -2088,7 +2088,7 @@ static void __init amb_ucode_version (am } // swap bits within byte to get Ethernet ordering -u8 bit_swap (u8 byte) +static u8 bit_swap (u8 byte) { const u8 swap[] = { 0x0, 0x8, 0x4, 0xc, diff -puN drivers/atm/atmtcp.c~small-drivers-atm-cleanups drivers/atm/atmtcp.c --- 25/drivers/atm/atmtcp.c~small-drivers-atm-cleanups 2004-12-01 23:42:29.796904344 -0800 +++ 25-akpm/drivers/atm/atmtcp.c 2004-12-01 23:42:29.817901152 -0800 @@ -396,7 +396,7 @@ static int atmtcp_create(int itf,int per } -int atmtcp_attach(struct atm_vcc *vcc,int itf) +static int atmtcp_attach(struct atm_vcc *vcc,int itf) { struct atm_dev *dev; @@ -427,13 +427,13 @@ int atmtcp_attach(struct atm_vcc *vcc,in } -int atmtcp_create_persistent(int itf) +static int atmtcp_create_persistent(int itf) { return atmtcp_create(itf,1,NULL); } -int atmtcp_remove_persistent(int itf) +static int atmtcp_remove_persistent(int itf) { struct atm_dev *dev; struct atmtcp_dev_data *dev_data; diff -puN drivers/atm/firestream.c~small-drivers-atm-cleanups drivers/atm/firestream.c --- 25/drivers/atm/firestream.c~small-drivers-atm-cleanups 2004-12-01 23:42:29.798904040 -0800 +++ 25-akpm/drivers/atm/firestream.c 2004-12-01 23:42:29.819900848 -0800 @@ -82,14 +82,14 @@ static int num=0x5a; * would be interpreted. -- REW */ #define NP FS_NR_FREE_POOLS -int rx_buf_sizes[NP] = {128, 256, 512, 1024, 2048, 4096, 16384, 65520}; +static int rx_buf_sizes[NP] = {128, 256, 512, 1024, 2048, 4096, 16384, 65520}; /* log2: 7 8 9 10 11 12 14 16 */ #if 0 -int rx_pool_sizes[NP] = {1024, 1024, 512, 256, 128, 64, 32, 32}; +static int rx_pool_sizes[NP] = {1024, 1024, 512, 256, 128, 64, 32, 32}; #else /* debug */ -int rx_pool_sizes[NP] = {128, 128, 128, 64, 64, 64, 32, 32}; +static int rx_pool_sizes[NP] = {128, 128, 128, 64, 64, 64, 32, 32}; #endif /* log2: 10 10 9 8 7 6 5 5 */ /* sumlog2: 17 18 18 18 18 18 19 21 */ @@ -250,7 +250,7 @@ struct reginit_item { }; -struct reginit_item PHY_NTC_INIT[] __devinitdata = { +static struct reginit_item PHY_NTC_INIT[] __devinitdata = { { PHY_CLEARALL, 0x40 }, { 0x12, 0x0001 }, { 0x13, 0x7605 }, @@ -334,7 +334,7 @@ module_param(fs_keystream, int, 0); #define func_exit() fs_dprintk (FS_DEBUG_FLOW, "fs: exit %s\n", __FUNCTION__) -struct fs_dev *fs_boards = NULL; +static struct fs_dev *fs_boards = NULL; #ifdef DEBUG @@ -1921,7 +1921,7 @@ static int __devinit firestream_init_one return -ENODEV; } -void __devexit firestream_remove_one (struct pci_dev *pdev) +static void __devexit firestream_remove_one (struct pci_dev *pdev) { int i; struct fs_dev *dev, *nxtdev; diff -puN drivers/atm/he.c~small-drivers-atm-cleanups drivers/atm/he.c --- 25/drivers/atm/he.c~small-drivers-atm-cleanups 2004-12-01 23:42:29.800903736 -0800 +++ 25-akpm/drivers/atm/he.c 2004-12-01 23:42:29.821900544 -0800 @@ -147,7 +147,7 @@ static u8 read_prom_byte(struct he_dev * /* globals */ -struct he_dev *he_devs = NULL; +static struct he_dev *he_devs = NULL; static int disable64 = 0; static short nvpibits = -1; static short nvcibits = -1; @@ -155,6 +155,48 @@ static short rx_skb_reserve = 16; static int irq_coalesce = 1; static int sdh = 0; +/* Read from EEPROM = 0000 0011b */ +static unsigned int readtab[] = { + CS_HIGH | CLK_HIGH, + CS_LOW | CLK_LOW, + CLK_HIGH, /* 0 */ + CLK_LOW, + CLK_HIGH, /* 0 */ + CLK_LOW, + CLK_HIGH, /* 0 */ + CLK_LOW, + CLK_HIGH, /* 0 */ + CLK_LOW, + CLK_HIGH, /* 0 */ + CLK_LOW, + CLK_HIGH, /* 0 */ + CLK_LOW | SI_HIGH, + CLK_HIGH | SI_HIGH, /* 1 */ + CLK_LOW | SI_HIGH, + CLK_HIGH | SI_HIGH /* 1 */ +}; + +/* Clock to read from/write to the EEPROM */ +static unsigned int clocktab[] = { + CLK_LOW, + CLK_HIGH, + CLK_LOW, + CLK_HIGH, + CLK_LOW, + CLK_HIGH, + CLK_LOW, + CLK_HIGH, + CLK_LOW, + CLK_HIGH, + CLK_LOW, + CLK_HIGH, + CLK_LOW, + CLK_HIGH, + CLK_LOW, + CLK_HIGH, + CLK_LOW +}; + static struct atmdev_ops he_ops = { .open = he_open, diff -puN drivers/atm/he.h~small-drivers-atm-cleanups drivers/atm/he.h --- 25/drivers/atm/he.h~small-drivers-atm-cleanups 2004-12-01 23:42:29.801903584 -0800 +++ 25-akpm/drivers/atm/he.h 2004-12-01 23:42:29.822900392 -0800 @@ -892,47 +892,4 @@ struct he_vcc #define SI_HIGH ID_DIN /* HOST_CNTL_ID_PROM_DATA_IN */ #define EEPROM_DELAY 400 /* microseconds */ -/* Read from EEPROM = 0000 0011b */ -unsigned int readtab[] = { - CS_HIGH | CLK_HIGH, - CS_LOW | CLK_LOW, - CLK_HIGH, /* 0 */ - CLK_LOW, - CLK_HIGH, /* 0 */ - CLK_LOW, - CLK_HIGH, /* 0 */ - CLK_LOW, - CLK_HIGH, /* 0 */ - CLK_LOW, - CLK_HIGH, /* 0 */ - CLK_LOW, - CLK_HIGH, /* 0 */ - CLK_LOW | SI_HIGH, - CLK_HIGH | SI_HIGH, /* 1 */ - CLK_LOW | SI_HIGH, - CLK_HIGH | SI_HIGH /* 1 */ -}; - -/* Clock to read from/write to the EEPROM */ -unsigned int clocktab[] = { - CLK_LOW, - CLK_HIGH, - CLK_LOW, - CLK_HIGH, - CLK_LOW, - CLK_HIGH, - CLK_LOW, - CLK_HIGH, - CLK_LOW, - CLK_HIGH, - CLK_LOW, - CLK_HIGH, - CLK_LOW, - CLK_HIGH, - CLK_LOW, - CLK_HIGH, - CLK_LOW -}; - - #endif /* _HE_H_ */ diff -puN drivers/atm/idt77105.c~small-drivers-atm-cleanups drivers/atm/idt77105.c --- 25/drivers/atm/idt77105.c~small-drivers-atm-cleanups 2004-12-01 23:42:29.803903280 -0800 +++ 25-akpm/drivers/atm/idt77105.c 2004-12-01 23:42:29.823900240 -0800 @@ -323,7 +323,7 @@ static int idt77105_start(struct atm_dev } -int idt77105_stop(struct atm_dev *dev) +static int idt77105_stop(struct atm_dev *dev) { struct idt77105_priv *walk, *prev; diff -puN drivers/atm/idt77105.h~small-drivers-atm-cleanups drivers/atm/idt77105.h --- 25/drivers/atm/idt77105.h~small-drivers-atm-cleanups 2004-12-01 23:42:29.804903128 -0800 +++ 25-akpm/drivers/atm/idt77105.h 2004-12-01 23:42:29.823900240 -0800 @@ -77,7 +77,6 @@ #ifdef __KERNEL__ int idt77105_init(struct atm_dev *dev) __init; -int idt77105_stop(struct atm_dev *dev); #endif /* diff -puN drivers/atm/idt77252.h~small-drivers-atm-cleanups drivers/atm/idt77252.h --- 25/drivers/atm/idt77252.h~small-drivers-atm-cleanups 2004-12-01 23:42:29.805902976 -0800 +++ 25-akpm/drivers/atm/idt77252.h 2004-12-01 23:42:29.824900088 -0800 @@ -275,7 +275,7 @@ struct rsq_info { struct rsq_entry *next; struct rsq_entry *last; dma_addr_t paddr; -} rsq_info; +}; /*****************************************************************************/ diff -puN drivers/atm/iphase.c~small-drivers-atm-cleanups drivers/atm/iphase.c --- 25/drivers/atm/iphase.c~small-drivers-atm-cleanups 2004-12-01 23:42:29.807902672 -0800 +++ 25-akpm/drivers/atm/iphase.c 2004-12-01 23:42:29.827899632 -0800 @@ -72,13 +72,13 @@ struct suni_priv { #define PRIV(dev) ((struct suni_priv *) dev->phy_data) static unsigned char ia_phy_get(struct atm_dev *dev, unsigned long addr); +static void desc_dbg(IADEV *iadev); static IADEV *ia_dev[8]; static struct atm_dev *_ia_dev[8]; static int iadev_count; static void ia_led_timer(unsigned long arg); static struct timer_list ia_timer = TIMER_INITIALIZER(ia_led_timer, 0, 0); -struct atm_vcc *vcc_close_que[100]; static int IA_TX_BUF = DFL_TX_BUFFERS, IA_TX_BUF_SZ = DFL_TX_BUF_SZ; static int IA_RX_BUF = DFL_RX_BUFFERS, IA_RX_BUF_SZ = DFL_RX_BUF_SZ; static uint IADebugFlag = /* IF_IADBG_ERR | IF_IADBG_CBR| IF_IADBG_INIT_ADAPTER @@ -147,7 +147,6 @@ static void ia_hack_tcq(IADEV *dev) { u_short desc1; u_short tcq_wr; struct ia_vcc *iavcc_r = NULL; - extern void desc_dbg(IADEV *iadev); tcq_wr = readl(dev->seg_reg+TCQ_WR_PTR) & 0xffff; while (dev->host_tcq_wr != tcq_wr) { @@ -187,7 +186,6 @@ static u16 get_desc (IADEV *dev, struct unsigned long delta; static unsigned long timer = 0; int ltimeout; - extern void desc_dbg(IADEV *iadev); ia_hack_tcq (dev); if(((jiffies - timer)>50)||((dev->ffL.tcq_rd==dev->host_tcq_wr))){ @@ -643,7 +641,7 @@ static int ia_que_tx (IADEV *iadev) { return 0; } -void ia_tx_poll (IADEV *iadev) { +static void ia_tx_poll (IADEV *iadev) { struct atm_vcc *vcc = NULL; struct sk_buff *skb = NULL, *skb1 = NULL; struct ia_vcc *iavcc; @@ -860,7 +858,7 @@ static void IaFrontEndIntr(IADEV *iadev) return; } -void ia_mb25_init (IADEV *iadev) +static void ia_mb25_init (IADEV *iadev) { volatile ia_mb25_t *mb25 = (ia_mb25_t*)iadev->phy; #if 0 @@ -875,7 +873,7 @@ void ia_mb25_init (IADEV *iadev) return; } -void ia_suni_pm7345_init (IADEV *iadev) +static void ia_suni_pm7345_init (IADEV *iadev) { volatile suni_pm7345_t *suni_pm7345 = (suni_pm7345_t *)iadev->phy; if (iadev->phy_type & FE_DS3_PHY) @@ -958,9 +956,8 @@ void ia_suni_pm7345_init (IADEV *iadev) /***************************** IA_LIB END *****************************/ -/* pwang_test debug utility */ -int tcnter = 0, rcnter = 0; -void xdump( u_char* cp, int length, char* prefix ) +static int tcnter = 0; +static void xdump( u_char* cp, int length, char* prefix ) { int col, count; u_char prntBuf[120]; @@ -1007,7 +1004,7 @@ static struct atm_dev *ia_boards = NULL; /*-- some utilities and memory allocation stuff will come here -------------*/ -void desc_dbg(IADEV *iadev) { +static void desc_dbg(IADEV *iadev) { u_short tcq_wr_ptr, tcq_st_ptr, tcq_ed_ptr; u32 i; diff -puN drivers/atm/iphase.h~small-drivers-atm-cleanups drivers/atm/iphase.h --- 25/drivers/atm/iphase.h~small-drivers-atm-cleanups 2004-12-01 23:42:29.809902368 -0800 +++ 25-akpm/drivers/atm/iphase.h 2004-12-01 23:42:29.828899480 -0800 @@ -1126,8 +1126,6 @@ typedef struct { #define FE_DS3_PHY 0x0080 /* DS3 */ #define FE_E3_PHY 0x0090 /* E3 */ -extern void ia_mb25_init (IADEV *); - /*********************** SUNI_PM7345 PHY DEFINE HERE *********************/ typedef struct _suni_pm7345_t { @@ -1326,8 +1324,6 @@ typedef struct _suni_pm7345_t #define SUNI_DS3_FOVRI 0x02 /* FIFO overrun */ #define SUNI_DS3_FUDRI 0x01 /* FIFO underrun */ -extern void ia_suni_pm7345_init (IADEV *iadev); - ///////////////////SUNI_PM7345 PHY DEFINE END ///////////////////////////// /* ia_eeprom define*/ diff -puN drivers/atm/nicstarmac.c~small-drivers-atm-cleanups drivers/atm/nicstarmac.c --- 25/drivers/atm/nicstarmac.c~small-drivers-atm-cleanups 2004-12-01 23:42:29.810902216 -0800 +++ 25-akpm/drivers/atm/nicstarmac.c 2004-12-01 23:42:29.829899328 -0800 @@ -35,6 +35,7 @@ #define SI_LOW 0x0000 /* Serial input data low */ /* Read Status Register = 0000 0101b */ +#if 0 static u_int32_t rdsrtab[] = { CS_HIGH | CLK_HIGH, @@ -55,6 +56,7 @@ static u_int32_t rdsrtab[] = CLK_LOW | SI_HIGH, CLK_HIGH | SI_HIGH /* 1 */ }; +#endif /* 0 */ /* Read from EEPROM = 0000 0011b */ @@ -117,7 +119,7 @@ static u_int32_t clocktab[] = * eeprom, then pull the result from bit 16 of the NicSTaR's General Purpose * register. */ - +#if 0 u_int32_t nicstar_read_eprom_status( virt_addr_t base ) { @@ -153,6 +155,7 @@ nicstar_read_eprom_status( virt_addr_t b osp_MicroDelay( CYCLE_DELAY ); return rbyte; } +#endif /* 0 */ /* diff -puN drivers/atm/nicstarmac.h~small-drivers-atm-cleanups drivers/atm/nicstarmac.h --- 25/drivers/atm/nicstarmac.h~small-drivers-atm-cleanups 2004-12-01 23:42:29.811902064 -0800 +++ 25-akpm/drivers/atm/nicstarmac.h 2004-12-01 23:42:29.829899328 -0800 @@ -9,6 +9,5 @@ typedef void __iomem *virt_addr_t; -u_int32_t nicstar_read_eprom_status( virt_addr_t base ); void nicstar_init_eprom( virt_addr_t base ); void nicstar_read_eprom( virt_addr_t, u_int8_t, u_int8_t *, u_int32_t); _