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

[PATCH] drivers/net/tokenring/: cleanups 



This patch contains the follwing cleanups:
- make needlessly global code static
- remove obsolete Emacs settings

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent 93ad4fb0

drivers/net/pcmcia/ibmtr_cs.c

+0 −3
Original line number Diff line number Diff line
@@ -119,9 +119,6 @@ static void ibmtr_detach(dev_link_t *); 


static dev_link_t *dev_list;



extern int ibmtr_probe_card(struct net_device *dev);

extern irqreturn_t tok_interrupt (int irq, void *dev_id, struct pt_regs *regs);



/*====================================================================*/



typedef struct ibmtr_dev_t {

drivers/net/tokenring/3c359.c

+2 −1
Original line number Diff line number Diff line
@@ -276,7 +276,8 @@ static void xl_ee_write(struct net_device *dev, int ee_addr, u16 ee_value) 
	return ; 

}

 

int __devinit xl_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 

static int __devinit xl_probe(struct pci_dev *pdev,

			      const struct pci_device_id *ent) 

{

	struct net_device *dev ; 

	struct xl_private *xl_priv ;

drivers/net/tokenring/3c359_microcode.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


static int mc_size = 24880 ; 



u8 microcode[] = { 

static const u8 microcode[] = { 

 0xfe,0x3a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00

,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00

,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00

drivers/net/tokenring/abyss.c

+0 −11
Original line number Diff line number Diff line
@@ -468,14 +468,3 @@ static void __exit abyss_rmmod (void) 
module_init(abyss_init);

module_exit(abyss_rmmod);



/*

 * Local variables:

 *  compile-command: "gcc -DMODVERSIONS  -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c abyss.c"

 *  alt-compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c abyss.c"

 *  c-set-style "K&R"

 *  c-indent-level: 8

 *  c-basic-offset: 8

 *  tab-width: 8

 * End:

 */

drivers/net/tokenring/ibmtr.c

+14 −14
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static char version[] __initdata = 


/* this allows displaying full adapter information */



char *channel_def[] __devinitdata = { "ISA", "MCA", "ISA P&P" };

static char *channel_def[] __devinitdata = { "ISA", "MCA", "ISA P&P" };



static char pcchannelid[] __devinitdata = {

	0x05, 0x00, 0x04, 0x09,
@@ -171,7 +171,7 @@ static char mcchannelid[] __devinitdata = { 
	0x03, 0x08, 0x02, 0x00

};



char __devinit *adapter_def(char type)

static char __devinit *adapter_def(char type)

{

	switch (type) {

	case 0xF: return "PC Adapter | PC Adapter II | Adapter/A";
@@ -184,7 +184,7 @@ char __devinit *adapter_def(char type) 


#define TRC_INIT 0x01		/*  Trace initialization & PROBEs */

#define TRC_INITV 0x02		/*  verbose init trace points     */

unsigned char ibmtr_debug_trace = 0;

static unsigned char ibmtr_debug_trace = 0;



static int 	ibmtr_probe(struct net_device *dev);

static int	ibmtr_probe1(struct net_device *dev, int ioaddr);
@@ -192,20 +192,20 @@ static unsigned char get_sram_size(struct tok_info *adapt_info); 
static int 	trdev_init(struct net_device *dev);

static int 	tok_open(struct net_device *dev);

static int 	tok_init_card(struct net_device *dev);

void 		tok_open_adapter(unsigned long dev_addr);

static void	tok_open_adapter(unsigned long dev_addr);

static void 	open_sap(unsigned char type, struct net_device *dev);

static void 	tok_set_multicast_list(struct net_device *dev);

static int 	tok_send_packet(struct sk_buff *skb, struct net_device *dev);

static int 	tok_close(struct net_device *dev);

irqreturn_t tok_interrupt(int irq, void *dev_id, struct pt_regs *regs);

static irqreturn_t tok_interrupt(int irq, void *dev_id, struct pt_regs *regs);

static void 	initial_tok_int(struct net_device *dev);

static void 	tr_tx(struct net_device *dev);

static void 	tr_rx(struct net_device *dev);

void 		ibmtr_reset_timer(struct timer_list*tmr,struct net_device *dev);

static void	ibmtr_reset_timer(struct timer_list*tmr,struct net_device *dev);

static void	tok_rerun(unsigned long dev_addr);

void 		ibmtr_readlog(struct net_device *dev);

static void	ibmtr_readlog(struct net_device *dev);

static struct 	net_device_stats *tok_get_stats(struct net_device *dev);

int 		ibmtr_change_mtu(struct net_device *dev, int mtu);

static int	ibmtr_change_mtu(struct net_device *dev, int mtu);

static void	find_turbo_adapters(int *iolist);



static int ibmtr_portlist[IBMTR_MAX_ADAPTERS+1] __devinitdata = {
@@ -928,7 +928,7 @@ static int tok_open(struct net_device *dev) 
#define DLC_MAX_SAP_OFST        32

#define DLC_MAX_STA_OFST        33



void tok_open_adapter(unsigned long dev_addr)

static void tok_open_adapter(unsigned long dev_addr)

{

	struct net_device *dev = (struct net_device *) dev_addr;

	struct tok_info *ti;
@@ -1099,7 +1099,7 @@ static void __iomem *map_address(struct tok_info *ti, unsigned index, __u8 *page 
	return ti->sram_virt + index;

}



void dir_open_adapter (struct net_device *dev)

static void dir_open_adapter (struct net_device *dev)

{

        struct tok_info *ti = (struct tok_info *) dev->priv;

        unsigned char ret_code;
@@ -1172,7 +1172,7 @@ void dir_open_adapter (struct net_device *dev) 


/******************************************************************************/



irqreturn_t tok_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t tok_interrupt(int irq, void *dev_id, struct pt_regs *regs)

{

	unsigned char status;

	/*  unsigned char status_even ; */
@@ -1840,7 +1840,7 @@ static void tr_rx(struct net_device *dev) 


/*****************************************************************************/



void ibmtr_reset_timer(struct timer_list *tmr, struct net_device *dev)

static void ibmtr_reset_timer(struct timer_list *tmr, struct net_device *dev)

{

	tmr->expires = jiffies + TR_RETRY_INTERVAL;

	tmr->data = (unsigned long) dev;
@@ -1872,7 +1872,7 @@ void tok_rerun(unsigned long dev_addr){ 


/*****************************************************************************/



void ibmtr_readlog(struct net_device *dev)

static void ibmtr_readlog(struct net_device *dev)

{

	struct tok_info *ti;
@@ -1905,7 +1905,7 @@ static struct net_device_stats *tok_get_stats(struct net_device *dev) 


/*****************************************************************************/



int ibmtr_change_mtu(struct net_device *dev, int mtu)

static int ibmtr_change_mtu(struct net_device *dev, int mtu)

{

	struct tok_info *ti = (struct tok_info *) dev->priv;