Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7665a089 authored by Adrian Bunk's avatar Adrian Bunk Committed by Jeff Garzik
Browse files

[PATCH] drivers/net/wan/: possible cleanups 



This patch contains possible cleanups including the following:
- make needlessly global code static
- #if 0 the following unused global function:
  - sdladrv.c: sdla_intde
- remove the following unused global variable:
  - lmc_media.c: lmc_t1_cables
- remove the following unneeded EXPORT_SYMBOL's:
  - cycx_drv.c: cycx_inten
  - sdladrv.c: sdla_inten
  - sdladrv.c: sdla_intde
  - sdladrv.c: sdla_intack
  - sdladrv.c: sdla_intr
  - syncppp.c: sppp_input
  - syncppp.c: sppp_change_mtu

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 8e18d1f9

drivers/net/wan/cycx_drv.c

+3 −4
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static long cycx_2x_irq_options[] = { 7, 3, 5, 9, 10, 11, 12, 15 }; 
 *		< 0	error.

 * Context:	process */



int __init cycx_drv_init(void)

static int __init cycx_drv_init(void)

{

	printk(KERN_INFO "%s v%u.%u %s\n", fullname, MOD_VERSION, MOD_RELEASE,

			 copyright);
@@ -119,7 +119,7 @@ int __init cycx_drv_init(void) 


/* Module 'remove' entry point.

 * o release all remaining system resources */

void cycx_drv_cleanup(void)

static void cycx_drv_cleanup(void)

{

}
@@ -184,8 +184,7 @@ int cycx_down(struct cycx_hw *hw) 
}



/* Enable interrupt generation.  */

EXPORT_SYMBOL(cycx_inten);

void cycx_inten(struct cycx_hw *hw)

static void cycx_inten(struct cycx_hw *hw)

{

	writeb(0, hw->dpmbase);

}

drivers/net/wan/cycx_main.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static struct cycx_device *cycx_card_array; /* adapter data space */ 
 *		< 0	error.

 * Context:	process

 */

int __init cycx_init(void)

static int __init cycx_init(void)

{

	int cnt, err = -ENOMEM;

drivers/net/wan/dscc4.c

+8 −6
Original line number Diff line number Diff line
@@ -446,8 +446,8 @@ static inline unsigned int dscc4_tx_quiescent(struct dscc4_dev_priv *dpriv, 
	return readl(dpriv->base_addr + CH0FTDA + dpriv->dev_id*4) == dpriv->ltda;

}



int state_check(u32 state, struct dscc4_dev_priv *dpriv, struct net_device *dev,

		const char *msg)

static int state_check(u32 state, struct dscc4_dev_priv *dpriv,

		       struct net_device *dev, const char *msg)

{

	int ret = 0;
@@ -466,7 +466,8 @@ int state_check(u32 state, struct dscc4_dev_priv *dpriv, struct net_device *dev, 
	return ret;

}



void dscc4_tx_print(struct net_device *dev, struct dscc4_dev_priv *dpriv,

static void dscc4_tx_print(struct net_device *dev,

			   struct dscc4_dev_priv *dpriv,

			   char *msg)

{

	printk(KERN_DEBUG "%s: tx_current=%02d tx_dirty=%02d (%s)\n",
@@ -507,7 +508,8 @@ static void dscc4_release_ring(struct dscc4_dev_priv *dpriv) 
	}

}



inline int try_get_rx_skb(struct dscc4_dev_priv *dpriv, struct net_device *dev)

static inline int try_get_rx_skb(struct dscc4_dev_priv *dpriv,

				 struct net_device *dev)

{

	unsigned int dirty = dpriv->rx_dirty%RX_RING_SIZE;

	struct RxFD *rx_fd = dpriv->rx_fd + dirty;
@@ -1891,7 +1893,7 @@ try: 
 * It failed and locked solid. Thus the introduction of a dummy skb.

 * Problem is acknowledged in errata sheet DS5. Joy :o/

 */

struct sk_buff *dscc4_init_dummy_skb(struct dscc4_dev_priv *dpriv)

static struct sk_buff *dscc4_init_dummy_skb(struct dscc4_dev_priv *dpriv)

{

	struct sk_buff *skb;

drivers/net/wan/farsync.c

+12 −12
Original line number Diff line number Diff line
@@ -74,11 +74,11 @@ MODULE_LICENSE("GPL"); 
/*

 * Modules parameters and associated varaibles

 */

int fst_txq_low = FST_LOW_WATER_MARK;

int fst_txq_high = FST_HIGH_WATER_MARK;

int fst_max_reads = 7;

int fst_excluded_cards = 0;

int fst_excluded_list[FST_MAX_CARDS];

static int fst_txq_low = FST_LOW_WATER_MARK;

static int fst_txq_high = FST_HIGH_WATER_MARK;

static int fst_max_reads = 7;

static int fst_excluded_cards = 0;

static int fst_excluded_list[FST_MAX_CARDS];



module_param(fst_txq_low, int, 0);

module_param(fst_txq_high, int, 0);
@@ -572,13 +572,13 @@ static void do_bottom_half_rx(struct fst_card_info *card); 
static void fst_process_tx_work_q(unsigned long work_q);

static void fst_process_int_work_q(unsigned long work_q);



DECLARE_TASKLET(fst_tx_task, fst_process_tx_work_q, 0);

DECLARE_TASKLET(fst_int_task, fst_process_int_work_q, 0);

static DECLARE_TASKLET(fst_tx_task, fst_process_tx_work_q, 0);

static DECLARE_TASKLET(fst_int_task, fst_process_int_work_q, 0);



struct fst_card_info *fst_card_array[FST_MAX_CARDS];

spinlock_t fst_work_q_lock;

u64 fst_work_txq;

u64 fst_work_intq;

static struct fst_card_info *fst_card_array[FST_MAX_CARDS];

static spinlock_t fst_work_q_lock;

static u64 fst_work_txq;

static u64 fst_work_intq;



static void

fst_q_work_item(u64 * queue, int card_index)
@@ -1497,7 +1497,7 @@ do_bottom_half_rx(struct fst_card_info *card) 
 *      The interrupt service routine

 *      Dev_id is our fst_card_info pointer

 */

irqreturn_t

static irqreturn_t

fst_intr(int irq, void *dev_id, struct pt_regs *regs)

{

	struct fst_card_info *card;

drivers/net/wan/hdlc_fr.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static int pvc_close(struct net_device *dev) 






int pvc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

static int pvc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

{

	pvc_device *pvc = dev_to_pvc(dev);

	fr_proto_pvc_info info;