29 files changed, 161 insertions, 118 deletions

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 3c679d30b698..b6e290956214 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -194,6 +194,8 @@ static DECLARE_WAIT_QUEUE_HEAD(ms_wait);
  */
 #define MAX_ERRORS 12
 
+#define custom amiga_custom
+
 /* Prevent "aliased" accesses. */
 static int fd_ref[4] = { 0,0,0,0 };
 static int fd_device[4] = { 0, 0, 0, 0 };
@@ -1439,6 +1441,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
 {
         int drive = iminor(inode) & 3;
         static struct floppy_struct getprm;
+        void __user *argp = (void __user *)param;
 
         switch(cmd){
         case FDFMTBEG:
@@ -1484,9 +1487,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
                 getprm.head=unit[drive].type->heads;
                 getprm.sect=unit[drive].dtype->sects * unit[drive].type->sect_mult;
                 getprm.size=unit[drive].blocks;
-                if (copy_to_user((void *)param,
-                                 (void *)&getprm,
-                                 sizeof(struct floppy_struct)))
+                if (copy_to_user(argp, &getprm, sizeof(struct floppy_struct)))
                         return -EFAULT;
                 break;
         case FDSETPRM:
@@ -1498,8 +1499,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
                 break;
 #ifdef RAW_IOCTL
         case IOCTL_RAW_TRACK:
-                if (copy_to_user((void *)param, raw_buf,
-                                 unit[drive].type->read_size))
+                if (copy_to_user(argp, raw_buf, unit[drive].type->read_size))
                         return -EFAULT;
                 else
                         return unit[drive].type->read_size;
@@ -1654,12 +1654,6 @@ static struct block_device_operations floppy_fops = {
         .media_changed  = amiga_floppy_change,
 };
 
-void __init amiga_floppy_setup (char *str, int *ints)
-{
-        printk (KERN_INFO "amiflop: Setting default df0 to %x\n", ints[1]);
-        fd_def_df0 = ints[1];
-}
-
 static int __init fd_probe_drives(void)
 {
         int drive,drives,nomem;
@@ -1845,4 +1839,18 @@ void cleanup_module(void)
         unregister_blkdev(FLOPPY_MAJOR, "fd");
 }
 #endif
+
+#else
+static int __init amiga_floppy_setup (char *str)
+{
+        int n;
+        if (!MACH_IS_AMIGA)
+                return 0;
+        if (!get_option(&str, &n))
+                return 0;
+        printk (KERN_INFO "amiflop: Setting default df0 to %x\n", n);
+        fd_def_df0 = n;
+}
+
+__setup("floppy=", amiga_floppy_setup);
 #endif
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 3aa68a5447d6..f8ce235ccfc3 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1361,7 +1361,7 @@ static int floppy_revalidate(struct gendisk *disk)
                    formats, for 'permanent user-defined' parameter:
                    restore default_params[] here if flagged valid! */
                 if (default_params[drive].blocks == 0)
-                        UDT = 0;
+                        UDT = NULL;
                 else
                         UDT = &default_params[drive];
         }
@@ -1495,6 +1495,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
         struct floppy_struct getprm;
         int settype;
         struct floppy_struct setprm;
+        void __user *argp = (void __user *)param;
 
         switch (cmd) {
         case FDGETPRM:
@@ -1521,7 +1522,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
                 getprm.head = 2;
                 getprm.track = dtp->blocks/dtp->spt/2;
                 getprm.stretch = dtp->stretch;
-                if (copy_to_user((void *)param, &getprm, sizeof(getprm)))
+                if (copy_to_user(argp, &getprm, sizeof(getprm)))
                         return -EFAULT;
                 return 0;
         }
@@ -1540,7 +1541,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
                 /* get the parameters from user space */
                 if (floppy->ref != 1 && floppy->ref != -1)
                         return -EBUSY;
-                if (copy_from_user(&setprm, (void *) param, sizeof(setprm)))
+                if (copy_from_user(&setprm, argp, sizeof(setprm)))
                         return -EFAULT;
                 /* 
                  * first of all: check for floppy change and revalidate, 
@@ -1647,7 +1648,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
         case FDFMTTRK:
                 if (floppy->ref != 1 && floppy->ref != -1)
                         return -EBUSY;
-                if (copy_from_user(&fmt_desc, (void *) param, sizeof(fmt_desc)))
+                if (copy_from_user(&fmt_desc, argp, sizeof(fmt_desc)))
                         return -EFAULT;
                 return do_format(drive, type, &fmt_desc);
         case FDCLRPRM:
@@ -1950,14 +1951,20 @@ Enomem:
         return -ENOMEM;
 }
 
-
-void __init atari_floppy_setup( char *str, int *ints )
+#ifndef MODULE
+static int __init atari_floppy_setup(char *str)
 {
+        int ints[3 + FD_MAX_UNITS];
         int i;
+
+        if (!MACH_IS_ATARI)
+                return 0;
+
+        str = get_options(str, 3 + FD_MAX_UNITS, ints);
         
         if (ints[0] < 1) {
                 printk(KERN_ERR "ataflop_setup: no arguments!\n" );
-                return;
+                return 0;
         }
         else if (ints[0] > 2+FD_MAX_UNITS) {
                 printk(KERN_ERR "ataflop_setup: too many arguments\n" );
@@ -1977,9 +1984,13 @@ void __init atari_floppy_setup( char *str, int *ints )
                 else
                         UserSteprate[i-3] = ints[i];
         }
+        return 1;
 }
 
-static void atari_floppy_exit(void)
+__setup("floppy=", atari_floppy_setup);
+#endif
+
+static void __exit atari_floppy_exit(void)
 {
         int i;
         blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256);
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 869518e4035f..667a21c72edb 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -99,6 +99,7 @@ static char *serial_version = "4.30";
 #define _INLINE_ inline
 #endif
 
+#define custom amiga_custom
 static char *serial_name = "Amiga-builtin serial driver";
 
 static struct tty_driver *serial_driver;
@@ -1088,7 +1089,7 @@ static void rs_unthrottle(struct tty_struct * tty)
  */
 
 static int get_serial_info(struct async_struct * info,
-                           struct serial_struct * retinfo)
+                           struct serial_struct __user * retinfo)
 {
         struct serial_struct tmp;
         struct serial_state *state = info->state;
@@ -1112,7 +1113,7 @@ static int get_serial_info(struct async_struct * info,
 }
 
 static int set_serial_info(struct async_struct * info,
-                           struct serial_struct * new_info)
+                           struct serial_struct __user * new_info)
 {
         struct serial_struct new_serial;
         struct serial_state old_state, *state;
@@ -1193,7 +1194,7 @@ check_and_exit:
  *          transmit holding register is empty.  This functionality
  *          allows an RS485 driver to be written in user space. 
  */
-static int get_lsr_info(struct async_struct * info, unsigned int *value)
+static int get_lsr_info(struct async_struct * info, unsigned int __user *value)
 {
         unsigned char status;
         unsigned int result;
@@ -1284,6 +1285,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
         struct async_struct * info = (struct async_struct *)tty->driver_data;
         struct async_icount cprev, cnow;        /* kernel counter temps */
         struct serial_icounter_struct icount;
+        void __user *argp = (void __user *)arg;
         unsigned long flags;
 
         if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
@@ -1298,19 +1300,17 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
 
         switch (cmd) {
                 case TIOCGSERIAL:
-                        return get_serial_info(info,
-                                               (struct serial_struct *) arg);
+                        return get_serial_info(info, argp);
                 case TIOCSSERIAL:
-                        return set_serial_info(info,
-                                               (struct serial_struct *) arg);
+                        return set_serial_info(info, argp);
                 case TIOCSERCONFIG:
                         return 0;
 
                 case TIOCSERGETLSR: /* Get line status register */
-                        return get_lsr_info(info, (unsigned int *) arg);
+                        return get_lsr_info(info, argp);
 
                 case TIOCSERGSTRUCT:
-                        if (copy_to_user((struct async_struct *) arg,
+                        if (copy_to_user(argp,
                                          info, sizeof(struct async_struct)))
                                 return -EFAULT;
                         return 0;
@@ -1369,7 +1369,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
                         icount.brk = cnow.brk;
                         icount.buf_overrun = cnow.buf_overrun;
 
-                        if (copy_to_user((void *)arg, &icount, sizeof(icount)))
+                        if (copy_to_user(argp, &icount, sizeof(icount)))
                                 return -EFAULT;
                         return 0;
                 case TIOCSERGWILD:
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 8693835cb2d5..e233cf280bc0 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -165,7 +165,7 @@ static int dsp56k_reset(void)
         return 0;
 }
 
-static int dsp56k_upload(u_char *bin, int len)
+static int dsp56k_upload(u_char __user *bin, int len)
 {
         int i;
         u_char *p;
@@ -199,7 +199,7 @@ static int dsp56k_upload(u_char *bin, int len)
         return 0;
 }
 
-static ssize_t dsp56k_read(struct file *file, char *buf, size_t count,
+static ssize_t dsp56k_read(struct file *file, char __user *buf, size_t count,
                            loff_t *ppos)
 {
         struct inode *inode = file->f_dentry->d_inode;
@@ -225,10 +225,10 @@ static ssize_t dsp56k_read(struct file *file, char *buf, size_t count,
                 }
                 case 2:  /* 16 bit */
                 {
-                        short *data;
+                        short __user *data;
 
                         count /= 2;
-                        data = (short*) buf;
+                        data = (short __user *) buf;
                         handshake(count, dsp56k.maxio, dsp56k.timeout, DSP56K_RECEIVE,
                                   put_user(dsp56k_host_interface.data.w[1], data+n++));
                         return 2*n;
@@ -244,10 +244,10 @@ static ssize_t dsp56k_read(struct file *file, char *buf, size_t count,
                 }
                 case 4:  /* 32 bit */
                 {
-                        long *data;
+                        long __user *data;
 
                         count /= 4;
-                        data = (long*) buf;
+                        data = (long __user *) buf;
                         handshake(count, dsp56k.maxio, dsp56k.timeout, DSP56K_RECEIVE,
                                   put_user(dsp56k_host_interface.data.l, data+n++));
                         return 4*n;
@@ -262,7 +262,7 @@ static ssize_t dsp56k_read(struct file *file, char *buf, size_t count,
         }
 }
 
-static ssize_t dsp56k_write(struct file *file, const char *buf, size_t count,
+static ssize_t dsp56k_write(struct file *file, const char __user *buf, size_t count,
                             loff_t *ppos)
 {
         struct inode *inode = file->f_dentry->d_inode;
@@ -287,10 +287,10 @@ static ssize_t dsp56k_write(struct file *file, const char *buf, size_t count,
                 }
                 case 2:  /* 16 bit */
                 {
-                        const short *data;
+                        const short __user *data;
 
                         count /= 2;
-                        data = (const short *)buf;
+                        data = (const short __user *)buf;
                         handshake(count, dsp56k.maxio, dsp56k.timeout, DSP56K_TRANSMIT,
                                   get_user(dsp56k_host_interface.data.w[1], data+n++));
                         return 2*n;
@@ -306,10 +306,10 @@ static ssize_t dsp56k_write(struct file *file, const char *buf, size_t count,
                 }
                 case 4:  /* 32 bit */
                 {
-                        const long *data;
+                        const long __user *data;
 
                         count /= 4;
-                        data = (const long *)buf;
+                        data = (const long __user *)buf;
                         handshake(count, dsp56k.maxio, dsp56k.timeout, DSP56K_TRANSMIT,
                                   get_user(dsp56k_host_interface.data.l, data+n++));
                         return 4*n;
@@ -328,6 +328,7 @@ static int dsp56k_ioctl(struct inode *inode, struct file *file,
                         unsigned int cmd, unsigned long arg)
 {
         int dev = iminor(inode) & 0x0f;
+        void __user *argp = (void __user *)arg;
 
         switch(dev)
         {
@@ -336,9 +337,9 @@ static int dsp56k_ioctl(struct inode *inode, struct file *file,
                 switch(cmd) {
                 case DSP56K_UPLOAD:
                 {
-                        char *bin;
+                        char __user *bin;
                         int r, len;
-                        struct dsp56k_upload *binary = (struct dsp56k_upload *) arg;
+                        struct dsp56k_upload __user *binary = argp;
     
                         if(get_user(len, &binary->len) < 0)
                                 return -EFAULT;
@@ -372,7 +373,7 @@ static int dsp56k_ioctl(struct inode *inode, struct file *file,
                 case DSP56K_HOST_FLAGS:
                 {
                         int dir, out, status;
-                        struct dsp56k_host_flags *hf = (struct dsp56k_host_flags*) arg;
+                        struct dsp56k_host_flags __user *hf = argp;
     
                         if(get_user(dir, &hf->dir) < 0)
                                 return -EFAULT;
diff --git a/drivers/char/scc.h b/drivers/char/scc.h
index 51810f72f1a9..93998f5baff5 100644
--- a/drivers/char/scc.h
+++ b/drivers/char/scc.h
@@ -399,7 +399,7 @@ struct scc_port {
                 __asm__ __volatile__ ( "tstb %0" : : "g" (*_scc_del) : "cc" );\
     } while (0)
 
-extern unsigned char scc_shadow[2][16];
+static unsigned char scc_shadow[2][16];
 
 /* The following functions should relax the somehow complicated
  * register access of the SCC. _SCCwrite() stores all written values
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 362b33556b1a..745979f33dc2 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -159,7 +159,7 @@ struct input_event_compat {
 #ifdef CONFIG_X86_64
 #  define COMPAT_TEST is_compat_task()
 #elif defined(CONFIG_IA64)
-#  define COMPAT_TEST IS_IA32_PROCESS(ia64_task_regs(current))
+#  define COMPAT_TEST IS_IA32_PROCESS(task_pt_regs(current))
 #elif defined(CONFIG_S390)
 #  define COMPAT_TEST test_thread_flag(TIF_31BIT)
 #elif defined(CONFIG_MIPS)
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
index 8558a99f6635..ec55a29fc861 100644
--- a/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
@@ -64,8 +64,8 @@ static irqreturn_t amijoy_interrupt(int irq, void *dummy, struct pt_regs *fp)
                 if (amijoy[i]) {
 
                         switch (i) {
-                                case 0: data = ~custom.joy0dat; button = (~ciaa.pra >> 6) & 1; break;
-                                case 1: data = ~custom.joy1dat; button = (~ciaa.pra >> 7) & 1; break;
+                                case 0: data = ~amiga_custom.joy0dat; button = (~ciaa.pra >> 6) & 1; break;
+                                case 1: data = ~amiga_custom.joy1dat; button = (~ciaa.pra >> 7) & 1; break;
                         }
 
                         input_regs(amijoy_dev[i], fp);
diff --git a/drivers/input/mouse/amimouse.c b/drivers/input/mouse/amimouse.c
index d13d4c8fe3c5..c8b2cc9f184c 100644
--- a/drivers/input/mouse/amimouse.c
+++ b/drivers/input/mouse/amimouse.c
@@ -41,7 +41,7 @@ static irqreturn_t amimouse_interrupt(int irq, void *dummy, struct pt_regs *fp)
         unsigned short joy0dat, potgor;
         int nx, ny, dx, dy;
 
-        joy0dat = custom.joy0dat;
+        joy0dat = amiga_custom.joy0dat;
 
         nx = joy0dat & 0xff;
         ny = joy0dat >> 8;
@@ -57,7 +57,7 @@ static irqreturn_t amimouse_interrupt(int irq, void *dummy, struct pt_regs *fp)
         amimouse_lastx = nx;
         amimouse_lasty = ny;
 
-        potgor = custom.potgor;
+        potgor = amiga_custom.potgor;
 
         input_regs(amimouse_dev, fp);
 
@@ -77,7 +77,7 @@ static int amimouse_open(struct input_dev *dev)
 {
         unsigned short joy0dat;
 
-        joy0dat = custom.joy0dat;
+        joy0dat = amiga_custom.joy0dat;
 
         amimouse_lastx = joy0dat & 0xff;
         amimouse_lasty = joy0dat >> 8;
diff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c
index 71aeb912ec61..d56d400b6aaa 100644
--- a/drivers/macintosh/adb-iop.c
+++ b/drivers/macintosh/adb-iop.c
@@ -239,7 +239,7 @@ static int adb_iop_write(struct adb_request *req)
 
         local_irq_save(flags);
 
-        req->next = 0;
+        req->next = NULL;
         req->sent = 0;
         req->complete = 0;
         req->reply_len = 0;
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index e9a159ad3022..2a2ffe060169 100644
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -260,7 +260,7 @@ static int macii_write(struct adb_request *req)
                 return -EINVAL;
         }
         
-        req->next = 0;
+        req->next = NULL;
         req->sent = 0;
         req->complete = 0;
         req->reply_len = 0;
@@ -295,7 +295,7 @@ static void macii_poll(void)
         unsigned long flags;
 
         local_irq_save(flags);
-        if (via[IFR] & SR_INT) macii_interrupt(0, 0, 0);
+        if (via[IFR] & SR_INT) macii_interrupt(0, NULL, NULL);
         local_irq_restore(flags);
 }
 
diff --git a/drivers/macintosh/via-maciisi.c b/drivers/macintosh/via-maciisi.c
index a1966975d58f..0129fcc3b183 100644
--- a/drivers/macintosh/via-maciisi.c
+++ b/drivers/macintosh/via-maciisi.c
@@ -294,6 +294,24 @@ static void maciisi_sync(struct adb_request *req)
                 printk(KERN_ERR "maciisi_send_request: poll timed out!\n");
 }
 
+int
+maciisi_request(struct adb_request *req, void (*done)(struct adb_request *),
+            int nbytes, ...)
+{
+        va_list list;
+        int i;
+
+        req->nbytes = nbytes;
+        req->done = done;
+        req->reply_expected = 0;
+        va_start(list, nbytes);
+        for (i = 0; i < nbytes; i++)
+                req->data[i++] = va_arg(list, int);
+        va_end(list);
+
+        return maciisi_send_request(req, 1);
+}
+
 /* Enqueue a request, and run the queue if possible */
 static int
 maciisi_write(struct adb_request* req)
@@ -308,7 +326,7 @@ maciisi_write(struct adb_request* req)
                 req->complete = 1;
                 return -EINVAL;
         }
-        req->next = 0;
+        req->next = NULL;
         req->sent = 0;
         req->complete = 0;
         req->reply_len = 0;
@@ -403,7 +421,7 @@ maciisi_poll(void)
 
         local_irq_save(flags);
         if (via[IFR] & SR_INT) {
-                maciisi_interrupt(0, 0, 0);
+                maciisi_interrupt(0, NULL, NULL);
         }
         else /* avoid calling this function too quickly in a loop */
                 udelay(ADB_DELAY);
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index 6f80d76ac17c..f08e52f2107b 100644
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -493,7 +493,7 @@ pmu_queue_request(struct adb_request *req)
                 return -EINVAL;
         }
 
-        req->next = 0;
+        req->next = NULL;
         req->sent = 0;
         req->complete = 0;
         local_irq_save(flags);
@@ -717,7 +717,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs)
                                 printk(KERN_ERR "PMU: extra ADB reply\n");
                                 return;
                         }
-                        req_awaiting_reply = 0;
+                        req_awaiting_reply = NULL;
                         if (len <= 2)
                                 req->reply_len = 0;
                         else {
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 0302723fa21f..1778104e106c 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1238,6 +1238,7 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
         mdk_rdev_t *same_pdev;
         char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];
         struct kobject *ko;
+        char *s;
 
         if (rdev->mddev) {
                 MD_BUG();
@@ -1277,6 +1278,8 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
         bdevname(rdev->bdev,b);
         if (kobject_set_name(&rdev->kobj, "dev-%s", b) < 0)
                 return -ENOMEM;
+        while ( (s=strchr(rdev->kobj.k_name, '/')) != NULL)
+                *s = '!';
                         
         list_add(&rdev->same_set, &mddev->disks);
         rdev->mddev = mddev;
diff --git a/drivers/net/hplance.c b/drivers/net/hplance.c
index 08703d6f934c..d8410634bcaf 100644
--- a/drivers/net/hplance.c
+++ b/drivers/net/hplance.c
@@ -150,7 +150,7 @@ static void __init hplance_init(struct net_device *dev, struct dio_dev *d)
         lp->lance.name = (char*)d->name;                /* discards const, shut up gcc */
         lp->lance.base = va;
         lp->lance.init_block = (struct lance_init_block *)(va + HPLANCE_MEMOFF); /* CPU addr */
-        lp->lance.lance_init_block = 0;                 /* LANCE addr of same RAM */
+        lp->lance.lance_init_block = NULL;              /* LANCE addr of same RAM */
         lp->lance.busmaster_regval = LE_C3_BSWP;        /* we're bigendian */
         lp->lance.irq = d->ipl;
         lp->lance.writerap = hplance_writerap;
diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c
index d8c99f038fa0..06cb460361a8 100644
--- a/drivers/net/mac8390.c
+++ b/drivers/net/mac8390.c
@@ -559,55 +559,52 @@ static void mac8390_no_reset(struct net_device *dev)
 /* directly from daynaport.c by Alan Cox */
 static void dayna_memcpy_fromcard(struct net_device *dev, void *to, int from, int count)
 {
-        volatile unsigned short *ptr;
-        unsigned short *target=to;
+        volatile unsigned char *ptr;
+        unsigned char *target=to;
         from<<=1;       /* word, skip overhead */
-        ptr=(unsigned short *)(dev->mem_start+from);
+        ptr=(unsigned char *)(dev->mem_start+from);
         /* Leading byte? */
         if (from&2) {
-                *((char *)target)++ = *(((char *)ptr++)-1);
+                *target++ = ptr[-1];
+                ptr += 2;
                 count--;
         }
         while(count>=2)
         {
-                *target++=*ptr++;       /* Copy and */
-                ptr++;                  /* skip cruft */
+                *(unsigned short *)target = *(unsigned short volatile *)ptr;
+                ptr += 4;                       /* skip cruft */
+                target += 2;
                 count-=2;
         }
         /* Trailing byte? */
         if(count)
-        {
-                /* Big endian */
-                unsigned short v=*ptr;
-                *((char *)target)=v>>8;
-        }
+                *target = *ptr;
 }
 
 static void dayna_memcpy_tocard(struct net_device *dev, int to, const void *from, int count)
 {
         volatile unsigned short *ptr;
-        const unsigned short *src=from;
+        const unsigned char *src=from;
         to<<=1; /* word, skip overhead */
         ptr=(unsigned short *)(dev->mem_start+to);
         /* Leading byte? */
         if (to&2) { /* avoid a byte write (stomps on other data) */
-                ptr[-1] = (ptr[-1]&0xFF00)|*((unsigned char *)src)++;
+                ptr[-1] = (ptr[-1]&0xFF00)|*src++;
                 ptr++;
                 count--;
         }
         while(count>=2)
         {
-                *ptr++=*src++;          /* Copy and */
+                *ptr++=*(unsigned short *)src;          /* Copy and */
                 ptr++;                  /* skip cruft */
+                src += 2;
                 count-=2;
         }
         /* Trailing byte? */
         if(count)
         {
-                /* Big endian */
-                unsigned short v=*src;
                 /* card doesn't like byte writes */
-                *ptr=(*ptr&0x00FF)|(v&0xFF00);
+                *ptr=(*ptr&0x00FF)|(*src << 8);
         }
 }
 
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index 5c8fcd40ef4d..01bdb2334058 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -389,7 +389,7 @@ static int __init lance_probe( struct net_device *dev)
         dev->stop = &lance_close;
         dev->get_stats = &lance_get_stats;
         dev->set_multicast_list = &set_multicast_list;
-        dev->set_mac_address = 0;
+        dev->set_mac_address = NULL;
 //      KLUDGE -- REMOVE ME
         set_bit(__LINK_STATE_PRESENT, &dev->state);
 
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index f062ea0f813a..6e0c059df6a5 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -45,7 +45,7 @@ obj-$(CONFIG_CYBERSTORMII_SCSI)	+= NCR53C9x.o	cyberstormII.o
 obj-$(CONFIG_BLZ2060_SCSI)      += NCR53C9x.o   blz2060.o
 obj-$(CONFIG_BLZ1230_SCSI)      += NCR53C9x.o   blz1230.o
 obj-$(CONFIG_FASTLANE_SCSI)     += NCR53C9x.o   fastlane.o
-obj-$(CONFIG_OKTAGON_SCSI)      += NCR53C9x.o   oktagon_esp.o   oktagon_io.o
+obj-$(CONFIG_OKTAGON_SCSI)      += NCR53C9x.o   oktagon_esp_mod.o
 obj-$(CONFIG_ATARI_SCSI)        += atari_scsi.o
 obj-$(CONFIG_MAC_SCSI)          += mac_scsi.o
 obj-$(CONFIG_SCSI_MAC_ESP)      += mac_esp.o    NCR53C9x.o
@@ -164,6 +164,7 @@ CFLAGS_ncr53c8xx.o	:= $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m)
 zalon7xx-objs   := zalon.o ncr53c8xx.o
 NCR_Q720_mod-objs       := NCR_Q720.o ncr53c8xx.o
 libata-objs     := libata-core.o libata-scsi.o
+oktagon_esp_mod-objs    := oktagon_esp.o oktagon_io.o
 
 # Files generated that shall be removed upon make clean
 clean-files :=  53c7xx_d.h 53c700_d.h   \
diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c
index 640590bd014a..c7dd0154d012 100644
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
@@ -1799,6 +1799,7 @@ static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs)
                  */
                 int oldphase, i = 0; /* or where we left off last time ?? esp->current_data ?? */
                 int fifocnt = 0;
+                unsigned char *p = phys_to_virt((unsigned long)SCptr->SCp.ptr);
 
                 oldphase = esp_read(eregs->esp_status) & ESP_STAT_PMASK;
 
@@ -1860,7 +1861,7 @@ static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs)
 
                                 /* read fifo */
                                 for(j=0;j<fifocnt;j++)
-                                        SCptr->SCp.ptr[i++] = esp_read(eregs->esp_fdata);
+                                        p[i++] = esp_read(eregs->esp_fdata);
 
                                 ESPDATA(("(%d) ", i));
 
@@ -1882,7 +1883,7 @@ static int esp_do_data(struct NCR_ESP *esp, struct ESP_regs *eregs)
 
                                 /* fill fifo */
                                 for(j=0;j<this_count;j++)
-                                        esp_write(eregs->esp_fdata, SCptr->SCp.ptr[i++]);
+                                        esp_write(eregs->esp_fdata, p[i++]);
 
                                 /* how many left if this goes out ?? */
                                 hmuch -= this_count;
diff --git a/drivers/scsi/blz1230.c b/drivers/scsi/blz1230.c
index 763e409a1ff3..3867ac2de4c2 100644
--- a/drivers/scsi/blz1230.c
+++ b/drivers/scsi/blz1230.c
@@ -224,7 +224,7 @@ static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp)
 static void dma_dump_state(struct NCR_ESP *esp)
 {
         ESPLOG(("intreq:<%04x>, intena:<%04x>\n",
-                custom.intreqr, custom.intenar));
+                amiga_custom.intreqr, amiga_custom.intenar));
 }
 
 void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length)
@@ -298,7 +298,7 @@ static int dma_irq_p(struct NCR_ESP *esp)
 
 static int dma_ports_p(struct NCR_ESP *esp)
 {
-        return ((custom.intenar) & IF_PORTS);
+        return ((amiga_custom.intenar) & IF_PORTS);
 }
 
 static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
diff --git a/drivers/scsi/blz2060.c b/drivers/scsi/blz2060.c
index d72d05fffdfa..4ebe69e32756 100644
--- a/drivers/scsi/blz2060.c
+++ b/drivers/scsi/blz2060.c
@@ -190,7 +190,7 @@ static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp)
 static void dma_dump_state(struct NCR_ESP *esp)
 {
         ESPLOG(("intreq:<%04x>, intena:<%04x>\n",
-                custom.intreqr, custom.intenar));
+                amiga_custom.intreqr, amiga_custom.intenar));
 }
 
 static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length)
@@ -251,7 +251,7 @@ static void dma_led_on(struct NCR_ESP *esp)
 
 static int dma_ports_p(struct NCR_ESP *esp)
 {
-        return ((custom.intenar) & IF_PORTS);
+        return ((amiga_custom.intenar) & IF_PORTS);
 }
 
 static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
diff --git a/drivers/scsi/cyberstorm.c b/drivers/scsi/cyberstorm.c
index f9b940e56430..a4a4fac5c0a1 100644
--- a/drivers/scsi/cyberstorm.c
+++ b/drivers/scsi/cyberstorm.c
@@ -223,7 +223,7 @@ static void dma_dump_state(struct NCR_ESP *esp)
                 esp->esp_id, ((struct cyber_dma_registers *)
                               (esp->dregs))->cond_reg));
         ESPLOG(("intreq:<%04x>, intena:<%04x>\n",
-                custom.intreqr, custom.intenar));
+                amiga_custom.intreqr, amiga_custom.intenar));
 }
 
 static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length)
@@ -322,7 +322,7 @@ static void dma_led_on(struct NCR_ESP *esp)
 
 static int dma_ports_p(struct NCR_ESP *esp)
 {
-        return ((custom.intenar) & IF_PORTS);
+        return ((amiga_custom.intenar) & IF_PORTS);
 }
 
 static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
diff --git a/drivers/scsi/cyberstormII.c b/drivers/scsi/cyberstormII.c
index a3caabfd7557..3a803d73bc5f 100644
--- a/drivers/scsi/cyberstormII.c
+++ b/drivers/scsi/cyberstormII.c
@@ -200,7 +200,7 @@ static void dma_dump_state(struct NCR_ESP *esp)
                 esp->esp_id, ((struct cyberII_dma_registers *)
                               (esp->dregs))->cond_reg));
         ESPLOG(("intreq:<%04x>, intena:<%04x>\n",
-                custom.intreqr, custom.intenar));
+                amiga_custom.intreqr, amiga_custom.intenar));
 }
 
 static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length)
@@ -259,7 +259,7 @@ static void dma_led_on(struct NCR_ESP *esp)
 
 static int dma_ports_p(struct NCR_ESP *esp)
 {
-        return ((custom.intenar) & IF_PORTS);
+        return ((amiga_custom.intenar) & IF_PORTS);
 }
 
 static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
diff --git a/drivers/scsi/fastlane.c b/drivers/scsi/fastlane.c
index ccee68b52f7e..8ae9c406a83b 100644
--- a/drivers/scsi/fastlane.c
+++ b/drivers/scsi/fastlane.c
@@ -268,7 +268,7 @@ static void dma_dump_state(struct NCR_ESP *esp)
                 esp->esp_id, ((struct fastlane_dma_registers *)
                               (esp->dregs))->cond_reg));
         ESPLOG(("intreq:<%04x>, intena:<%04x>\n",
-                custom.intreqr, custom.intenar));
+                amiga_custom.intreqr, amiga_custom.intenar));
 }
 
 static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length)
@@ -368,7 +368,7 @@ static void dma_led_on(struct NCR_ESP *esp)
 
 static int dma_ports_p(struct NCR_ESP *esp)
 {
-        return ((custom.intenar) & IF_PORTS);
+        return ((amiga_custom.intenar) & IF_PORTS);
 }
 
 static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c
index 5d9c9ada814f..dee426f8c07b 100644
--- a/drivers/scsi/oktagon_esp.c
+++ b/drivers/scsi/oktagon_esp.c
@@ -490,7 +490,7 @@ static void dma_led_on(struct NCR_ESP *esp)
 
 static int dma_ports_p(struct NCR_ESP *esp)
 {
-        return ((custom.intenar) & IF_PORTS);
+        return ((amiga_custom.intenar) & IF_PORTS);
 }
 
 static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index fd63add6a577..fb53eeaee617 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -465,7 +465,7 @@ wd33c93_execute(struct Scsi_Host *instance)
          */
 
         cmd = (struct scsi_cmnd *) hostdata->input_Q;
-        prev = 0;
+        prev = NULL;
         while (cmd) {
                 if (!(hostdata->busy[cmd->device->id] & (1 << cmd->device->lun)))
                         break;
@@ -1569,7 +1569,7 @@ wd33c93_abort(struct scsi_cmnd * cmd)
  */
 
         tmp = (struct scsi_cmnd *) hostdata->input_Q;
-        prev = 0;
+        prev = NULL;
         while (tmp) {
                 if (tmp == cmd) {
                         if (prev)
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index d549e215f3c5..2c42a812655a 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -590,6 +590,8 @@ static u_short maxfmode, chipset;
 #define highw(x)        ((u_long)(x)>>16 & 0xffff)
 #define loww(x)         ((u_long)(x) & 0xffff)
 
+#define custom          amiga_custom
+
 #define VBlankOn()      custom.intena = IF_SETCLR|IF_COPER
 #define VBlankOff()     custom.intena = IF_COPER
 
@@ -1164,8 +1166,8 @@ static void ami_update_display(void);
 static void ami_init_display(void);
 static void ami_do_blank(void);
 static int ami_get_fix_cursorinfo(struct fb_fix_cursorinfo *fix);
-static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var, u_char *data);
-static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char *data);
+static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *data);
+static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *data);
 static int ami_get_cursorstate(struct fb_cursorstate *state);
 static int ami_set_cursorstate(struct fb_cursorstate *state);
 static void ami_set_sprite(void);
@@ -2179,6 +2181,7 @@ static int amifb_ioctl(struct inode *inode, struct file *file,
                 struct fb_var_cursorinfo var;
                 struct fb_cursorstate state;
         } crsr;
+        void __user *argp = (void __user *)arg;
         int i;
 
         switch (cmd) {
@@ -2186,33 +2189,32 @@ static int amifb_ioctl(struct inode *inode, struct file *file,
                         i = ami_get_fix_cursorinfo(&crsr.fix);
                         if (i)
                                 return i;
-                        return copy_to_user((void *)arg, &crsr.fix,
+                        return copy_to_user(argp, &crsr.fix,
                                             sizeof(crsr.fix)) ? -EFAULT : 0;
 
                 case FBIOGET_VCURSORINFO:
                         i = ami_get_var_cursorinfo(&crsr.var,
-                                ((struct fb_var_cursorinfo *)arg)->data);
+                                ((struct fb_var_cursorinfo __user *)arg)->data);
                         if (i)
                                 return i;
-                        return copy_to_user((void *)arg, &crsr.var,
+                        return copy_to_user(argp, &crsr.var,
                                             sizeof(crsr.var)) ? -EFAULT : 0;
 
                 case FBIOPUT_VCURSORINFO:
-                        if (copy_from_user(&crsr.var, (void *)arg,
-                                           sizeof(crsr.var)))
+                        if (copy_from_user(&crsr.var, argp, sizeof(crsr.var)))
                                 return -EFAULT;
                         return ami_set_var_cursorinfo(&crsr.var,
-                                ((struct fb_var_cursorinfo *)arg)->data);
+                                ((struct fb_var_cursorinfo __user *)arg)->data);
 
                 case FBIOGET_CURSORSTATE:
                         i = ami_get_cursorstate(&crsr.state);
                         if (i)
                                 return i;
-                        return copy_to_user((void *)arg, &crsr.state,
+                        return copy_to_user(argp, &crsr.state,
                                             sizeof(crsr.state)) ? -EFAULT : 0;
 
                 case FBIOPUT_CURSORSTATE:
-                        if (copy_from_user(&crsr.state, (void *)arg,
+                        if (copy_from_user(&crsr.state, argp,
                                            sizeof(crsr.state)))
                                 return -EFAULT;
                         return ami_set_cursorstate(&crsr.state);
@@ -3325,7 +3327,7 @@ static int ami_get_fix_cursorinfo(struct fb_fix_cursorinfo *fix)
         return 0;
 }
 
-static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var, u_char *data)
+static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *data)
 {
         struct amifb_par *par = &currentpar;
         register u_short *lspr, *sspr;
@@ -3347,14 +3349,14 @@ static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var, u_char *data)
         var->yspot = par->crsr.spot_y;
         if (size > var->height*var->width)
                 return -ENAMETOOLONG;
-        if (!access_ok(VERIFY_WRITE, (void *)data, size))
+        if (!access_ok(VERIFY_WRITE, data, size))
                 return -EFAULT;
         delta = 1<<par->crsr.fmode;
         lspr = lofsprite + (delta<<1);
         if (par->bplcon0 & BPC0_LACE)
                 sspr = shfsprite + (delta<<1);
         else
-                sspr = 0;
+                sspr = NULL;
         for (height = (short)var->height-1; height >= 0; height--) {
                 bits = 0; words = delta; datawords = 0;
                 for (width = (short)var->width-1; width >= 0; width--) {
@@ -3400,7 +3402,7 @@ static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var, u_char *data)
         return 0;
 }
 
-static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char *data)
+static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char __user *data)
 {
         struct amifb_par *par = &currentpar;
         register u_short *lspr, *sspr;
@@ -3427,7 +3429,7 @@ static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char *data)
                 return -EINVAL;
         if (!var->height)
                 return -EINVAL;
-        if (!access_ok(VERIFY_READ, (void *)data, var->width*var->height))
+        if (!access_ok(VERIFY_READ, data, var->width*var->height))
                 return -EFAULT;
         delta = 1<<fmode;
         lofsprite = shfsprite = (u_short *)spritememory;
@@ -3442,13 +3444,13 @@ static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char *data)
                 if (((var->height+2)<<fmode<<2) > SPRITEMEMSIZE)
                         return -EINVAL;
                 memset(lspr, 0, (var->height+2)<<fmode<<2);
-                sspr = 0;
+                sspr = NULL;
         }
         for (height = (short)var->height-1; height >= 0; height--) {
                 bits = 16; words = delta; datawords = 0;
                 for (width = (short)var->width-1; width >= 0; width--) {
                         unsigned long tdata = 0;
-                        get_user(tdata, (char *)data);
+                        get_user(tdata, data);
                         data++;
 #ifdef __mc68000__
                         asm volatile (
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index e370125e4fbc..ed81005cbdba 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3501,7 +3501,7 @@ err_release_mem:
 
 static int __devinit atyfb_atari_probe(void)
 {
-        struct aty_par *par;
+        struct atyfb_par *par;
         struct fb_info *info;
         int m64_num;
         u32 clock_r;
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index cfc748e94272..e6cbd9de944a 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -609,18 +609,19 @@ void __init macfb_setup(char *options)
         }
 }
 
-void __init macfb_init(void)
+static int __init macfb_init(void)
 {
         int video_cmap_len, video_is_nubus = 0;
         struct nubus_dev* ndev = NULL;
         char *option = NULL;
+        int err;
 
         if (fb_get_options("macfb", &option))
                 return -ENODEV;
         macfb_setup(option);
 
         if (!MACH_IS_MAC) 
-                return;
+                return -ENODEV;
 
         /* There can only be one internal video controller anyway so
            we're not too worried about this */
@@ -958,11 +959,11 @@ void __init macfb_init(void)
 
         fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0);
         
-        if (register_framebuffer(&fb_info) < 0)
-                return;
-
-        printk("fb%d: %s frame buffer device\n",
-               fb_info.node, fb_info.fix.id);
+        err = register_framebuffer(&fb_info);
+        if (!err)
+                printk("fb%d: %s frame buffer device\n",
+                       fb_info.node, fb_info.fix.id);
+        return err;
 }
 
 module_init(macfb_init);
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index 1a409c2c320c..7aa2d3de6d37 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -45,7 +45,7 @@ proc_bus_zorro_lseek(struct file *file, loff_t off, int whence)
 }
 
 static ssize_t
-proc_bus_zorro_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos)
+proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
 {
         struct inode *ino = file->f_dentry->d_inode;
         struct proc_dir_entry *dp = PDE(ino);