small drivers/atm cleanups (fwd)
PATCH 1/1 small drivers/atm cleanups (fwd)
The patch forwarded below still applies and compiles against 2.6.10-rc2-mm3.
Please apply.
----- Forwarded message from Adrian Bunk <[email protected]> -----
Date: Sat, 6 Nov 2004 00:27:19 +0100
From: Adrian Bunk <[email protected]>
To: [email protected]
Cc: [email protected], [email protected],
[email protected], [email protected]
Subject: [2.6 patch] small drivers/atm cleanups
The patch below makes the following changes under drivers/atm/ :
- make some needlessly global things static
- remove some unneeded variables and functions
Please review and apply if it's correct.
diffstat output:
drivers/atm/ambassador.c | 4 +- drivers/atm/atmtcp.c | 6 +-- drivers/atm/firestream.c | 12 +++---- drivers/atm/he.c | 44 +++++++++++++++++++++++++- drivers/atm/he.h | 43 ------------------------- drivers/atm/idt77105.c | 2 - drivers/atm/idt77105.h | 1 drivers/atm/idt77252.h | 2 - drivers/atm/iphase.c | 17 ++++------ drivers/atm/iphase.h | 4 -- drivers/atm/nicstarmac.c | 66 --------------------------------------- drivers/atm/nicstarmac.h | 1 12 files changed, 63 insertions(+), 139 deletions(-)
Signed-off-by Adrian Bunk <[email protected]>
drivers/atm/ambassador.c renamed from drivers/atm/ambassador.c.old +2 -2
@@ -1692,7 +1692,7 @@ }; -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 @@ }// 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 ,
drivers/atm/atmtcp.c renamed from drivers/atm/atmtcp.c.old +3 -3
@@ -388,7 +388,7 @@ } -int atmtcp_attach (struct atm_vcc *vcc,int itf) +static int atmtcp_attach (struct atm_vcc *vcc,int itf) {struct atm_dev *dev;
@@ -419,13 +419,13 @@ } -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;
drivers/atm/firestream.c renamed from drivers/atm/firestream.c.old +6 -6
@@ -82,14 +82,14 @@* 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 PHY_NTC_INIT []__devinitdata = { +static struct reginit_item PHY_NTC_INIT []__devinitdata = { {PHY_CLEARALL ,0x40 }, {0x12 ,0x0001 }, {0x13 ,0x7605 },
@@ -334,7 +334,7 @@#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 @@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;
drivers/atm/he.h renamed from drivers/atm/he.h.old +0 -43
47 lines not on this page · raw message
drivers/atm/he.c renamed from drivers/atm/he.c.old +43 -1
56 lines not on this page · raw message
drivers/atm/idt77105.h renamed from drivers/atm/idt77105.h.old +0 -1
@@ -77,7 +77,6 @@#ifdef __KERNEL__int idt77105_init (struct atm_dev *dev)__init ; -int idt77105_stop (struct atm_dev *dev);#endif /*
drivers/atm/idt77105.c renamed from drivers/atm/idt77105.c.old +1 -1
@@ -323,7 +323,7 @@ } -int idt77105_stop (struct atm_dev *dev) +static int idt77105_stop (struct atm_dev *dev) {struct idt77105_priv *walk, *prev;
drivers/atm/idt77252.h renamed from drivers/atm/idt77252.h.old +1 -1
@@ -275,7 +275,7 @@struct rsq_entry *next;struct rsq_entry *last;dma_addr_t paddr; -} rsq_info; +};/*****************************************************************************/
drivers/atm/iphase.h renamed from drivers/atm/iphase.h.old +0 -4
@@ -1126,8 +1126,6 @@#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 @@#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*/
drivers/atm/iphase.c renamed from drivers/atm/iphase.c.old +7 -10
@@ -72,13 +72,13 @@#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 @@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 @@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 @@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 @@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 @@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 @@/***************************** 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 @@/*-- 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 tmp, i;
drivers/atm/nicstarmac.h renamed from drivers/atm/nicstarmac.h.old +0 -1
@@ -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 );
drivers/atm/nicstarmac.c renamed from drivers/atm/nicstarmac.c.old +0 -66
78 lines not on this page · raw message
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
----- End forwarded message -----
Quoted 9 lines · Adrian Bunk
/*
- * This routine will clock theRead_Status_regfunction into the X2520
- * eeprom, then pull the result from bit 16 of the NicSTaR's General Purpose
- * register.
- */
-
-u_int32_t
-nicstar_read_eprom_status(virt_addr_tbase )
I'd be inclined to whack an #if 0 around functions such as this rather than removing them. Someone may come along one day and do some work on the driver, and nicstar_read_eprom_status() may prove to be useful to them.
Nobody would ever thing to go trolling back through the revision history looking to see if previously-interesting stuff was deleted.
Quoted 11 lines · Andrew Morton
Quoted 9 lines · Adrian Bunk
/*
- * This routine will clock theRead_Status_regfunction into the X2520
- * eeprom, then pull the result from bit 16 of the NicSTaR's General Purpose
- * register.
- */
-
-u_int32_t
-nicstar_read_eprom_status(virt_addr_tbase )
Quoted 4 lines
I'd be inclined to whack an #if 0 around functions such as this rather than removing them. Someone may come along one day and do some work on the driver, and
nicstar_read_eprom_status()may prove to be useful to them.
...
In this case, you also have to #if 0 rdsrtab.
Are you editing my patch or shall I send an updated patch?
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedPATCH 1/1 small drivers/atm cleanups
In reply to Andrew MortonQuoted 11 lines · Andrew Morton
Quoted 9 lines · Adrian Bunk
/*
- * This routine will clock theRead_Status_regfunction into the X2520
- * eeprom, then pull the result from bit 16 of the NicSTaR's General Purpose
- * register.
- */
-
-u_int32_t
-nicstar_read_eprom_status(virt_addr_tbase )
Quoted 6 lines
I'd be inclined to whack an #if 0 around functions such as this rather than removing them. Someone may come along one day and do some work on the driver, and
nicstar_read_eprom_status()may prove to be useful to them.Nobody would ever thing to go trolling back through the revision history looking to see if previously-interesting stuff was deleted.
Agreed. Updated patch:
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
Please review and apply if it's correct.
diffstat output:
drivers/atm/ambassador.c | 4 +-- drivers/atm/atmtcp.c | 6 ++--- drivers/atm/firestream.c | 12 +++++----- drivers/atm/he.c | 44 ++++++++++++++++++++++++++++++++++++++- drivers/atm/he.h | 43 -------------------------------------- drivers/atm/idt77105.c | 2 - drivers/atm/idt77105.h | 1 drivers/atm/idt77252.h | 2 - drivers/atm/iphase.c | 17 ++++++--------- drivers/atm/iphase.h | 4 --- drivers/atm/nicstarmac.h | 1 drivers/atm/nicstarmac.c | 5 +++- 12 files changed, 67 insertions(+), 74 deletions(-)
Signed-off-by Adrian Bunk <[email protected]>
drivers/atm/ambassador.c renamed from drivers/atm/ambassador.c.old +2 -2
@@ -1692,7 +1692,7 @@ }; -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 @@ }// 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 ,
drivers/atm/atmtcp.c renamed from drivers/atm/atmtcp.c.old +3 -3
@@ -388,7 +388,7 @@ } -int atmtcp_attach (struct atm_vcc *vcc,int itf) +static int atmtcp_attach (struct atm_vcc *vcc,int itf) {struct atm_dev *dev;
@@ -419,13 +419,13 @@ } -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;
drivers/atm/firestream.c renamed from drivers/atm/firestream.c.old +6 -6
@@ -82,14 +82,14 @@* 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 PHY_NTC_INIT []__devinitdata = { +static struct reginit_item PHY_NTC_INIT []__devinitdata = { {PHY_CLEARALL ,0x40 }, {0x12 ,0x0001 }, {0x13 ,0x7605 },
@@ -334,7 +334,7 @@#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 @@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;
drivers/atm/he.h renamed from drivers/atm/he.h.old +0 -43
47 lines not on this page · raw message
drivers/atm/he.c renamed from drivers/atm/he.c.old +43 -1
56 lines not on this page · raw message
drivers/atm/idt77105.h renamed from drivers/atm/idt77105.h.old +0 -1
@@ -77,7 +77,6 @@#ifdef __KERNEL__int idt77105_init (struct atm_dev *dev)__init ; -int idt77105_stop (struct atm_dev *dev);#endif /*
drivers/atm/idt77105.c renamed from drivers/atm/idt77105.c.old +1 -1
@@ -323,7 +323,7 @@ } -int idt77105_stop (struct atm_dev *dev) +static int idt77105_stop (struct atm_dev *dev) {struct idt77105_priv *walk, *prev;
drivers/atm/idt77252.h renamed from drivers/atm/idt77252.h.old +1 -1
@@ -275,7 +275,7 @@struct rsq_entry *next;struct rsq_entry *last;dma_addr_t paddr; -} rsq_info; +};/*****************************************************************************/
drivers/atm/iphase.h renamed from drivers/atm/iphase.h.old +0 -4
@@ -1126,8 +1126,6 @@#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 @@#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*/
drivers/atm/iphase.c renamed from drivers/atm/iphase.c.old +7 -10
@@ -72,13 +72,13 @@#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 @@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 @@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 @@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 @@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 @@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 @@/***************************** 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 @@/*-- 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 tmp, i;
drivers/atm/nicstarmac.h renamed from drivers/atm/nicstarmac.h.old +0 -1
@@ -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 );
drivers/atm/nicstarmac.c renamed from drivers/atm/nicstarmac.c.old +4 -1
@@ -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 @@CLK_LOW |SI_HIGH ,CLK_HIGH |SI_HIGH /* 1 */ }; +#endif /* 0 */ /* Read from EEPROM = 0000 0011b */
@@ -117,7 +119,7 @@* 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 @@osp_MicroDelay (CYCLE_DELAY ); return rbyte; } +#endif /* 0 */ /*