From: max attems hch send in a patch to remove MOD_{DEC,INC}_USE_COUNT. Let's also remove useless references to it (comments, old ifdefs). Signed-off-by: maximilian attems Signed-off-by: Andrew Morton --- 25-akpm/drivers/isdn/hysdn/hycapi.c | 3 --- 25-akpm/drivers/isdn/i4l/isdn_bsdcomp.c | 2 +- 25-akpm/drivers/media/video/bttv-i2c.c | 15 --------------- 25-akpm/drivers/media/video/saa7134/saa7134-i2c.c | 12 ------------ 25-akpm/drivers/net/declance.c | 9 --------- 25-akpm/drivers/net/starfire.c | 16 ++-------------- 6 files changed, 3 insertions(+), 54 deletions(-) diff -puN drivers/isdn/hysdn/hycapi.c~drivers-remove-unused-mod_decinc_use_count drivers/isdn/hysdn/hycapi.c --- 25/drivers/isdn/hysdn/hycapi.c~drivers-remove-unused-mod_decinc_use_count 2004-10-02 18:38:16.555651760 -0700 +++ 25-akpm/drivers/isdn/hysdn/hycapi.c 2004-10-02 18:38:16.573649024 -0700 @@ -246,8 +246,6 @@ hycapi_register_appl(struct capi_ctr *ct rp->level3cnt = MaxLogicalConnections; memcpy(&hycapi_applications[appl-1].rp, rp, sizeof(capi_register_params)); - -/* MOD_INC_USE_COUNT; */ } /********************************************************************* @@ -311,7 +309,6 @@ hycapi_release_appl(struct capi_ctr *ctr { hycapi_release_internal(ctrl, appl); } -/* MOD_DEC_USE_COUNT; */ } diff -puN drivers/isdn/i4l/isdn_bsdcomp.c~drivers-remove-unused-mod_decinc_use_count drivers/isdn/i4l/isdn_bsdcomp.c --- 25/drivers/isdn/i4l/isdn_bsdcomp.c~drivers-remove-unused-mod_decinc_use_count 2004-10-02 18:38:16.557651456 -0700 +++ 25-akpm/drivers/isdn/i4l/isdn_bsdcomp.c 2004-10-02 18:38:16.567649936 -0700 @@ -364,7 +364,7 @@ static void *bsd_alloc (struct isdn_ppp_ db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) * sizeof (db->lens[0])); if (!db->lens) { - bsd_free (db); /* calls MOD_DEC_USE_COUNT; */ + bsd_free (db); return (NULL); } } diff -puN drivers/media/video/bttv-i2c.c~drivers-remove-unused-mod_decinc_use_count drivers/media/video/bttv-i2c.c --- 25/drivers/media/video/bttv-i2c.c~drivers-remove-unused-mod_decinc_use_count 2004-10-02 18:38:16.559651152 -0700 +++ 25-akpm/drivers/media/video/bttv-i2c.c 2004-10-02 18:38:16.572649176 -0700 @@ -301,21 +301,6 @@ static struct i2c_adapter bttv_i2c_adap_ .client_unregister = detach_inform, }; -/* ----------------------------------------------------------------------- */ -/* I2C functions - common stuff */ - -#ifndef I2C_PEC -static void bttv_inc_use(struct i2c_adapter *adap) -{ - MOD_INC_USE_COUNT; -} - -static void bttv_dec_use(struct i2c_adapter *adap) -{ - MOD_DEC_USE_COUNT; -} -#endif - static int attach_inform(struct i2c_client *client) { struct bttv *btv = i2c_get_adapdata(client->adapter); diff -puN drivers/media/video/saa7134/saa7134-i2c.c~drivers-remove-unused-mod_decinc_use_count drivers/media/video/saa7134/saa7134-i2c.c --- 25/drivers/media/video/saa7134/saa7134-i2c.c~drivers-remove-unused-mod_decinc_use_count 2004-10-02 18:38:16.560651000 -0700 +++ 25-akpm/drivers/media/video/saa7134/saa7134-i2c.c 2004-10-02 18:38:16.572649176 -0700 @@ -311,18 +311,6 @@ static u32 functionality(struct i2c_adap return I2C_FUNC_SMBUS_EMUL; } -#ifndef I2C_PEC -static void inc_use(struct i2c_adapter *adap) -{ - MOD_INC_USE_COUNT; -} - -static void dec_use(struct i2c_adapter *adap) -{ - MOD_DEC_USE_COUNT; -} -#endif - static int attach_inform(struct i2c_client *client) { struct saa7134_dev *dev = client->adapter->algo_data; diff -puN drivers/net/declance.c~drivers-remove-unused-mod_decinc_use_count drivers/net/declance.c --- 25/drivers/net/declance.c~drivers-remove-unused-mod_decinc_use_count 2004-10-02 18:38:16.562650696 -0700 +++ 25-akpm/drivers/net/declance.c 2004-10-02 18:38:16.571649328 -0700 @@ -812,12 +812,6 @@ static int lance_open(struct net_device } status = init_restart_lance(lp); - - /* - * if (!status) - * MOD_INC_USE_COUNT; - */ - return status; } @@ -849,9 +843,6 @@ static int lance_close(struct net_device free_irq(lp->dma_irq, dev); } free_irq(dev->irq, dev); - /* - MOD_DEC_USE_COUNT; - */ return 0; } diff -puN drivers/net/starfire.c~drivers-remove-unused-mod_decinc_use_count drivers/net/starfire.c --- 25/drivers/net/starfire.c~drivers-remove-unused-mod_decinc_use_count 2004-10-02 18:38:16.564650392 -0700 +++ 25-akpm/drivers/net/starfire.c 2004-10-02 18:38:16.570649480 -0700 @@ -312,9 +312,6 @@ static int full_duplex[MAX_UNITS] = {0, #include -#define COMPAT_MOD_INC_USE_COUNT -#define COMPAT_MOD_DEC_USE_COUNT - #define init_tx_timer(dev, func, timeout) \ dev->tx_timeout = func; \ dev->watchdog_timeo = timeout; @@ -1110,14 +1107,9 @@ static int netdev_open(struct net_device size_t tx_done_q_size, rx_done_q_size, tx_ring_size, rx_ring_size; /* Do we ever need to reset the chip??? */ - - COMPAT_MOD_INC_USE_COUNT; - retval = request_irq(dev->irq, &intr_handler, SA_SHIRQ, dev->name, dev); - if (retval) { - COMPAT_MOD_DEC_USE_COUNT; + if (retval) return retval; - } /* Disable the Rx and Tx, and reset the chip. */ writel(0, ioaddr + GenCtrl); @@ -1134,10 +1126,8 @@ static int netdev_open(struct net_device rx_ring_size = sizeof(struct starfire_rx_desc) * RX_RING_SIZE; np->queue_mem_size = tx_done_q_size + rx_done_q_size + tx_ring_size + rx_ring_size; np->queue_mem = pci_alloc_consistent(np->pci_dev, np->queue_mem_size, &np->queue_mem_dma); - if (np->queue_mem == 0) { - COMPAT_MOD_DEC_USE_COUNT; + if (np->queue_mem == 0) return -ENOMEM; - } np->tx_done_q = np->queue_mem; np->tx_done_q_dma = np->queue_mem_dma; @@ -2150,8 +2140,6 @@ static int netdev_close(struct net_devic np->tx_info[i].skb = NULL; } - COMPAT_MOD_DEC_USE_COUNT; - return 0; } _