Merge bk://kernel.bkbits.net/acme/misc-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

drivers/atm/atmtcp.c

@@ -315,15 +315,9 @@ static struct atmdev_ops atmtcp_c_dev_ops = {
 
 
 static struct atm_dev atmtcp_control_dev = {
-	&atmtcp_c_dev_ops,
-	NULL,		/* no PHY */
-	"atmtcp",	/* type */
-	999,		/* dummy device number */
-	NULL,NULL,	/* pretend not to have any VCCs */
-	NULL,NULL,	/* no data */
-	{ 0 },		/* no flags */
-	NULL,		/* no local address */
-	{ 0 }		/* no ESI, no statistics */
+	.ops		= &atmtcp_c_dev_ops,
+	.type		= "atmtcp",
+	.number		= 999,
 };
 
 

drivers/block/nbd.c

@@ -37,6 +37,8 @@
 #define PARANOIA
 #include <linux/major.h>
 
+#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sched.h>

drivers/cdrom/gscd.c

@@ -268,7 +268,7 @@ static void __do_gscd_request(unsigned long dummy)
 		goto out;
 
 	if (req->cmd != READ) {
-		printk("GSCD: bad cmd %d\n", rq_data_dir(req));
+		printk("GSCD: bad cmd %lu\n", rq_data_dir(req));
 		end_request(req, 0);
 		goto repeat;
 	}

drivers/char/epca.c

@@ -141,12 +141,6 @@ static struct timer_list epca_timer;
 	configured.
 ----------------------------------------------------------------------- */
 	
-
-#ifdef MODULE
-int                init_module(void);
-void               cleanup_module(void);
-#endif /* MODULE */
-
 static inline void memwinon(struct board_info *b, unsigned int win);
 static inline void memwinoff(struct board_info *b, unsigned int win);
 static inline void globalwinon(struct channel *ch);
@@ -1534,8 +1528,7 @@ static int pc_open(struct tty_struct *tty, struct file * filp)
 } /* End pc_open */
 
 #ifdef MODULE
-/* -------------------- Begin init_module ---------------------- */
-int __init init_module()
+static int __init epca_module_init(void)
 { /* Begin init_module */
 
 	unsigned long	flags;
@@ -1548,8 +1541,9 @@ int __init init_module()
 	restore_flags(flags);
 
 	return(0);
-} /* End init_module */
+}
 
+module_init(epca_module_init);
 #endif
 
 #ifdef ENABLE_PCI
@@ -1559,8 +1553,8 @@ static struct pci_driver epca_driver;
 #ifdef MODULE
 /* -------------------- Begin cleanup_module  ---------------------- */
 
-void cleanup_module()
-{ /* Begin cleanup_module */
+static void __exit epca_module_exit(void)
+{
 
 	int               count, crd;
 	struct board_info *bd;
@@ -1613,7 +1607,8 @@ void cleanup_module()
 
 	restore_flags(flags);
 
-} /* End cleanup_module */
+}
+module_exit(epca_module_exit);
 #endif /* MODULE */
 
 /* ------------------ Begin pc_init  ---------------------- */

drivers/char/ftape/zftape/zftape-init.c

@@ -314,7 +314,7 @@ extern int zft_compressor_init(void);
 /*  Called by modules package when installing the driver or by kernel
  *  during the initialization phase
  */
-static int __init zft_init(void)
+int __init zft_init(void)
 {
 	int i;
 	TRACE_FUN(ft_t_flow);

drivers/char/ip2main.c

@@ -967,7 +967,7 @@ EXPORT_SYMBOL(ip2_loadmain);
 static void __init
 ip2_init_board( int boardnum )
 {
-	int i,rc;
+	int i;
 	int nports = 0, nboxes = 0;
 	i2ChanStrPtr pCh;
 	i2eBordStrPtr pB = i2BoardPtrTable[boardnum];

drivers/char/istallion.c

@@ -796,7 +796,6 @@ static struct file_operations	stli_fsiomem = {
  *	not increase character latency by much either...
  */
 static struct timer_list stli_timerlist = TIMER_INITIALIZER(stli_poll, 0, 0);
-};
 
 static int	stli_timeron;
 
@@ -813,7 +812,7 @@ static int	stli_timeron;
  *	Loadable module initialization stuff.
  */
 
-int init_module()
+static int __init istallion_module_init(void)
 {
 	unsigned long	flags;
 
@@ -831,7 +830,7 @@ int init_module()
 
 /*****************************************************************************/
 
-void cleanup_module()
+static void __exit istallion_module_exit(void)
 {
 	stlibrd_t	*brdp;
 	stliport_t	*portp;
@@ -898,6 +897,9 @@ void cleanup_module()
 	restore_flags(flags);
 }
 
+module_init(istallion_module_init);
+module_exit(istallion_module_exit);
+
 /*****************************************************************************/
 
 /*

drivers/char/scx200_gpio.c

@@ -6,6 +6,7 @@
    Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com> */
 
 #include <linux/config.h>
+#include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>

drivers/char/stallion.c

@@ -757,7 +757,7 @@ static struct file_operations	stl_fsiomem = {
  *	Loadable module initialization stuff.
  */
 
-int init_module()
+static int __init stallion_module_init(void)
 {
 	unsigned long	flags;
 
@@ -775,7 +775,7 @@ int init_module()
 
 /*****************************************************************************/
 
-void cleanup_module()
+static void __exit stallion_module_exit(void)
 {
 	stlbrd_t	*brdp;
 	stlpanel_t	*panelp;
@@ -851,6 +851,9 @@ void cleanup_module()
 	restore_flags(flags);
 }
 
+module_init(stallion_module_init);
+module_exit(stallion_module_exit);
+
 /*****************************************************************************/
 
 /*

drivers/char/watchdog/sbc60xxwdt.c

@@ -345,7 +345,7 @@ static int __init sbc60xxwdt_init(void)
 	release_region(WDT_START,1);
 err_out_region1:
 	release_region(WDT_STOP,1);
-err_out:
+/* err_out: */
 	return rc;
 }
 

drivers/media/dvb/av7110/saa7146_core.c

@@ -45,14 +45,14 @@ static int buffers = 2;
 
 /* insmod parameter: some programs (e.g. vic) do not allow to
    specify the used video-mode, so you have to tell this to the
-   modules by hand, 0 = PAL, 1 = NTSC  */
-static int mode = 0;
+   modules by hand, 0 = PAL (default), 1 = NTSC  */
+static int mode;
 
-/* debug levels: 0 -- no debugging outputs
+/* debug levels: 0 -- no debugging outputs: default
 		 1 -- prints out entering (and exiting if useful) of functions
 		 2 -- prints out very, very detailed informations of what is going on
 		 3 -- both of the above */
-int saa7146_debug = 0;	/* insmod parameter */
+int saa7146_debug;	/* insmod parameter */
 
 #define dprintk		if (saa7146_debug & 1) printk
 #define hprintk		if (saa7146_debug & 2) printk
@@ -796,7 +796,7 @@ void remove_saa7146(struct saa7146 *saa)
 static int saa7146_suspend(struct pci_dev *pdev, u32 state)
 {
         printk("saa7146_suspend()\n");
-	saa7146_core_command(((struct saa7146 *) pdev->driver_data)->i2c_bus,
+	saa7146_core_command(((struct saa7146 *)pci_get_drvdata(pdev))->i2c_bus,
 			     SAA7146_SUSPEND, 0);
 	return 0;
 }
@@ -805,7 +805,7 @@ static int
 saa7146_resume(struct pci_dev *pdev)
 {
         printk("saa7146_resume()\n");
-	saa7146_core_command(((struct saa7146 *) pdev->driver_data)->i2c_bus,
+	saa7146_core_command(((struct saa7146 *)pci_get_drvdata(pdev))->i2c_bus,
 			     SAA7146_RESUME, 0);
 	return 0;
 }
@@ -839,7 +839,7 @@ int __devinit saa7146_init_one (struct pci_dev *pdev,
 	memset (saa, 0, sizeof (struct saa7146));
 
 	saa->device = pdev;
-	saa->device->driver_data = saa;
+	pci_set_drvdata(pdev, saa);
 	saa->card_type = card_type;
 	saa->dvb_adapter = adap;
 
@@ -855,7 +855,7 @@ int __devinit saa7146_init_one (struct pci_dev *pdev,
 static
 void __devexit saa7146_remove_one (struct pci_dev *pdev)
 {
-	struct saa7146 *saa = pdev->driver_data;
+	struct saa7146 *saa = pci_get_drvdata(pdev);
 
 	dprintk("saa7146_remove_one()\n");
 

drivers/net/appletalk/cops.c

@@ -68,6 +68,7 @@ static const char *version =
 #include <linux/if_ltalk.h>	/* For ltalk_setup() */
 #include <linux/delay.h>	/* For udelay() */
 #include <linux/atalk.h>
+#include <linux/spinlock.h>
 
 #include <asm/system.h>
 #include <asm/bitops.h>
@@ -320,7 +321,7 @@ static int __init cops_probe1(struct net_device *dev, int ioaddr)
 
         lp = (struct cops_local *)dev->priv;
         memset(lp, 0, sizeof(struct cops_local));
-        spinlock_init(&lp->lock);
+        spin_lock_init(&lp->lock);
 
 	/* Copy local board variable to lp struct. */
 	lp->board               = board;

drivers/net/dl2k.c

@@ -1142,7 +1142,7 @@ set_multicast (struct net_device *dev)
 	u16 rx_mode = 0;
 	int i;
 	int bit;
-	int index, crc;
+	long index, crc;
 	struct dev_mc_list *mclist;
 	struct netdev_private *np = dev->priv;
 	

drivers/net/wan/hostess_sv11.c

@@ -211,7 +211,6 @@ static struct sv11_device *sv11_init(int iobase, int irq)
 {
 	struct z8530_dev *dev;
 	struct sv11_device *sv;
-	unsigned long flags;
 	
 	/*
 	 *	Get the needed I/O space

drivers/net/wan/sdla_fr.c

@@ -225,10 +225,10 @@ typedef struct fr_channel
 	sdla_t *card;			/* -> owner */
 	unsigned route_flag;		/* Add/Rem dest addr in route tables */
 	unsigned inarp;			/* Inverse Arp Request status */ 
-	unsigned char inarp_ready;	/* Ready to send requests */
+	long inarp_ready;		/* Ready to send requests */
 	int inarp_interval;		/* Time between InArp Requests */
 	unsigned long inarp_tick;	/* InArp jiffies tick counter */
-	unsigned char interface_down;	/* Bring interface down on disconnect */
+	long interface_down;		/* Bring interface down on disconnect */
       #if defined(LINUX_2_1) || defined(LINUX_2_4)
 	struct net_device_stats ifstats;	/* interface statistics */
       #else
@@ -259,8 +259,8 @@ typedef struct fr_channel
 
 	u32 ip_local;
 	u32 ip_remote;
-	u8  config_dlci;
-	u32 unconfig_dlci;
+	long config_dlci;
+	long unconfig_dlci;
 
 	/* Whether this interface should be setup as a gateway.
 	 * Used by dynamic route setup code */
@@ -1459,7 +1459,8 @@ static int if_send (struct sk_buff* skb, netdevice_t* dev)
         int err;
     	unsigned char *sendpacket;
     	fr508_flags_t* adptr_flags = card->flags;
-	int udp_type, delay_tx_queued=0;
+	int udp_type;
+	long delay_tx_queued = 0;
 	unsigned long smp_flags=0;
 	unsigned char attr = 0;
 
@@ -2811,7 +2812,7 @@ static void process_route (netdevice_t *dev)
 				chan->name, NIPQUAD(chan->ip_remote));
 
 		}else {
-			printk(KERN_INFO "%s: Route Added Successfully: %u.%u.%u.%U\n",
+			printk(KERN_INFO "%s: Route Added Successfully: %u.%u.%u.%u\n",
 				card->devname,NIPQUAD(chan->ip_remote));
 			chan->route_flag = ROUTE_ADDED;
 		}

drivers/net/wan/sdlamain.c

@@ -503,7 +503,7 @@ static int setup (wan_device_t* wandev, wandev_conf_t* conf)
 		}
 
 	}else{
-		printk(KERN_INFO "%s: Card Configured %i or Piggybacking %i!\n",
+		printk(KERN_INFO "%s: Card Configured %lu or Piggybacking %i!\n",
 			wandev->name,card->configured,card->wandev.piggyback);
 	} 
 

drivers/net/wan/sealevel.c

@@ -211,8 +211,6 @@ static struct slvl_board *slvl_init(int iobase, int irq, int txdma, int rxdma, i
 	struct z8530_dev *dev;
 	struct slvl_device *sv;
 	struct slvl_board *b;
-	
-	unsigned long flags;
 	int u;
 	
 	/*

drivers/parport/daisy.c

@@ -21,6 +21,9 @@
 
 #include <linux/parport.h>
 #include <linux/delay.h>
+#include <linux/sched.h>
+
+#include <asm/current.h>
 #include <asm/uaccess.h>
 
 #define DEBUG /* undef me for production */

drivers/parport/ieee1284_ops.c

@@ -17,6 +17,7 @@
 #include <linux/config.h>
 #include <linux/parport.h>
 #include <linux/delay.h>
+#include <linux/sched.h>
 #include <asm/uaccess.h>
 
 #undef DEBUG /* undef me for production */

drivers/parport/probe.c

@@ -7,6 +7,7 @@
 
 #include <linux/parport.h>
 #include <linux/ctype.h>
+#include <linux/string.h>
 #include <asm/uaccess.h>
 
 static struct {