patch-2.3.41 linux/drivers/net/wan/cycx_main.c

• Lines: 58
• Date: Wed Jan 26 13:25:58 2000
• Orig file: v2.3.40/linux/drivers/net/wan/cycx_main.c
• Orig date: Tue Jan 11 22:31:40 2000

diff -u --recursive --new-file v2.3.40/linux/drivers/net/wan/cycx_main.c linux/drivers/net/wan/cycx_main.c
@@ -13,6 +13,8 @@
 *		as published by the Free Software Foundation; either version
 *		2 of the License, or (at your option) any later version.
 * ============================================================================
+* 2000/01/21	acme		rename cyclomx_open to cyclomx_mod_inc_use_count
+*				and cyclomx_close to cyclomx_mod_dec_use_count
 * 2000/01/08	acme		cleanup
 * 1999/11/06	acme		cycx_down back to life (it needs to be
 *				called to iounmap the dpmbase)
@@ -49,7 +51,7 @@
 /* Defines & Macros */
 
 #define	DRV_VERSION	0		/* version number */
-#define	DRV_RELEASE	5		/* release (minor version) number */
+#define	DRV_RELEASE	6		/* release (minor version) number */
 #define	MAX_CARDS	1		/* max number of adapters */
 
 #ifndef	CONFIG_CYCLOMX_CARDS		/* configurable option */
@@ -132,9 +134,9 @@
 		err = register_wan_device(wandev);
 
 		if (err) {
-			printk(KERN_ERR
-				"%s: %s registration failed with error %d!\n",
-				drvname, card->devname, err);
+			printk(KERN_ERR "%s: %s registration failed with "
+					"error %d!\n",
+					drvname, card->devname, err);
 			break;
 		}
 	}
@@ -238,7 +240,7 @@
 	/* Initialize WAN device data space */
 	wandev->irq       = irq;
 	wandev->dma       = wandev->ioport = 0;
-	wandev->maddr     = (unsigned long*)card->hw.dpmbase;
+	wandev->maddr     = card->hw.dpmbase;
 	wandev->msize     = card->hw.dpmsize;
 	wandev->hw_opt[2] = 0;
 	wandev->hw_opt[3] = card->hw.fwid;
@@ -338,7 +340,7 @@
  * have to call MOD_INC_USE_COUNT, but cannot include 'module.h' where it's
  * defined more than once into the same kernel module.
  */
-void cyclomx_open (cycx_t *card)
+void cyclomx_mod_inc_use_count (cycx_t *card)
 {
 	++card->open_cnt;
 	MOD_INC_USE_COUNT;
@@ -350,7 +352,7 @@
  * have to call MOD_DEC_USE_COUNT, but cannot include 'module.h' where it's
  * defined more than once into the same kernel module.
  */
-void cyclomx_close (cycx_t *card)
+void cyclomx_mod_dec_use_count (cycx_t *card)
 {
 	--card->open_cnt;
 	MOD_DEC_USE_COUNT;