git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
char
/
rio
/
rio_linux.c
diff --git
a/drivers/char/rio/rio_linux.c
b/drivers/char/rio/rio_linux.c
index
78dd856
..
3fa80aa
100644
(file)
--- a/
drivers/char/rio/rio_linux.c
+++ b/
drivers/char/rio/rio_linux.c
@@
-33,7
+33,6
@@
* */
#include <linux/module.h>
* */
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/kdev_t.h>
#include <asm/io.h>
#include <linux/kernel.h>
#include <linux/kdev_t.h>
#include <asm/io.h>
#include <linux/kernel.h>
@@
-244,7
+243,7
@@
static struct real_driver rio_real_driver = {
*
*/
*
*/
-static struct file_operations rio_fw_fops = {
+static
const
struct file_operations rio_fw_fops = {
.owner = THIS_MODULE,
.ioctl = rio_fw_ioctl,
};
.owner = THIS_MODULE,
.ioctl = rio_fw_ioctl,
};
@@
-333,9
+332,9
@@
int RIODelay_ni(struct Port *PortP, int njiffies)
return !RIO_FAIL;
}
return !RIO_FAIL;
}
-void rio_copy_to_card(void *
to, void *from
, int len)
+void rio_copy_to_card(void *
from, void __iomem *to
, int len)
{
{
- rio_
memcpy_toio(NULL,
to, from, len);
+ rio_
copy_toio(
to, from, len);
}
int rio_minor(struct tty_struct *tty)
}
int rio_minor(struct tty_struct *tty)
@@
-573,7
+572,7
@@
static int rio_fw_ioctl(struct inode *inode, struct file *filp, unsigned int cmd
func_enter();
/* The "dev" argument isn't used. */
func_enter();
/* The "dev" argument isn't used. */
- rc = riocontrol(p, 0, cmd,
(void *)
arg, capable(CAP_SYS_ADMIN));
+ rc = riocontrol(p, 0, cmd, arg, capable(CAP_SYS_ADMIN));
func_exit();
return rc;
func_exit();
return rc;
@@
-583,6
+582,7
@@
extern int RIOShortCommand(struct rio_info *p, struct Port *PortP, int command,
static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg)
{
static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg)
{
+ void __user *argp = (void __user *)arg;
int rc;
struct Port *PortP;
int ival;
int rc;
struct Port *PortP;
int ival;
@@
-594,14
+594,14
@@
static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd
rc = 0;
switch (cmd) {
case TIOCSSOFTCAR:
rc = 0;
switch (cmd) {
case TIOCSSOFTCAR:
- if ((rc = get_user(ival, (unsigned
int *) arg
)) == 0) {
+ if ((rc = get_user(ival, (unsigned
__user *) argp
)) == 0) {
tty->termios->c_cflag = (tty->termios->c_cflag & ~CLOCAL) | (ival ? CLOCAL : 0);
}
break;
case TIOCGSERIAL:
rc = -EFAULT;
tty->termios->c_cflag = (tty->termios->c_cflag & ~CLOCAL) | (ival ? CLOCAL : 0);
}
break;
case TIOCGSERIAL:
rc = -EFAULT;
- if (access_ok(VERIFY_WRITE,
(void *) arg
, sizeof(struct serial_struct)))
- rc = gs_getserial(&PortP->gs,
(struct serial_struct *) arg
);
+ if (access_ok(VERIFY_WRITE,
argp
, sizeof(struct serial_struct)))
+ rc = gs_getserial(&PortP->gs,
argp
);
break;
case TCSBRK:
if (PortP->State & RIO_DELETED) {
break;
case TCSBRK:
if (PortP->State & RIO_DELETED) {
@@
-631,8
+631,8
@@
static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd
break;
case TIOCSSERIAL:
rc = -EFAULT;
break;
case TIOCSSERIAL:
rc = -EFAULT;
- if (access_ok(VERIFY_READ,
(void *) arg
, sizeof(struct serial_struct)))
- rc = gs_setserial(&PortP->gs,
(struct serial_struct *) arg
);
+ if (access_ok(VERIFY_READ,
argp
, sizeof(struct serial_struct)))
+ rc = gs_setserial(&PortP->gs,
argp
);
break;
default:
rc = -ENOIOCTLCMD;
break;
default:
rc = -ENOIOCTLCMD;
@@
-919,7
+919,7
@@
static void __exit rio_release_drivers(void)
static void fix_rio_pci(struct pci_dev *pdev)
{
unsigned long hwbase;
static void fix_rio_pci(struct pci_dev *pdev)
{
unsigned long hwbase;
- unsigned char *rebase;
+ unsigned char
__iomem
*rebase;
unsigned int t;
#define CNTRL_REG_OFFSET 0x50
unsigned int t;
#define CNTRL_REG_OFFSET 0x50
@@
-999,7
+999,7
@@
static int __init rio_init(void)
if (((1 << hp->Ivec) & rio_irqmask) == 0)
hp->Ivec = 0;
hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN);
if (((1 << hp->Ivec) & rio_irqmask) == 0)
hp->Ivec = 0;
hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN);
- hp->CardP = (struct DpRam *) hp->Caddr;
+ hp->CardP = (struct DpRam
__iomem
*) hp->Caddr;
hp->Type = RIO_PCI;
hp->Copy = rio_copy_to_card;
hp->Mode = RIO_PCI_BOOT_FROM_RAM;
hp->Type = RIO_PCI;
hp->Copy = rio_copy_to_card;
hp->Mode = RIO_PCI_BOOT_FROM_RAM;
@@
-1021,7
+1021,7
@@
static int __init rio_init(void)
p->RIONumHosts++;
found++;
} else {
p->RIONumHosts++;
found++;
} else {
- iounmap(
(char *) (p->RIOHosts[p->RIONumHosts].Caddr)
);
+ iounmap(
p->RIOHosts[p->RIONumHosts].Caddr
);
}
}
}
}
@@
-1047,7
+1047,7
@@
static int __init rio_init(void)
hp->Ivec = 0;
hp->Ivec |= 0x8000; /* Mark as non-sharable */
hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN);
hp->Ivec = 0;
hp->Ivec |= 0x8000; /* Mark as non-sharable */
hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN);
- hp->CardP = (struct DpRam *) hp->Caddr;
+ hp->CardP = (struct DpRam
__iomem
*) hp->Caddr;
hp->Type = RIO_PCI;
hp->Copy = rio_copy_to_card;
hp->Mode = RIO_PCI_BOOT_FROM_RAM;
hp->Type = RIO_PCI;
hp->Copy = rio_copy_to_card;
hp->Mode = RIO_PCI_BOOT_FROM_RAM;
@@
-1070,7
+1070,7
@@
static int __init rio_init(void)
p->RIONumHosts++;
found++;
} else {
p->RIONumHosts++;
found++;
} else {
- iounmap(
(char *) (p->RIOHosts[p->RIONumHosts].Caddr)
);
+ iounmap(
p->RIOHosts[p->RIONumHosts].Caddr
);
}
#else
printk(KERN_ERR "Found an older RIO PCI card, but the driver is not " "compiled to support it.\n");
}
#else
printk(KERN_ERR "Found an older RIO PCI card, but the driver is not " "compiled to support it.\n");
@@
-1085,7
+1085,7
@@
static int __init rio_init(void)
/* There was something about the IRQs of these cards. 'Forget what.--REW */
hp->Ivec = 0;
hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN);
/* There was something about the IRQs of these cards. 'Forget what.--REW */
hp->Ivec = 0;
hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN);
- hp->CardP = (struct DpRam *) hp->Caddr;
+ hp->CardP = (struct DpRam
__iomem
*) hp->Caddr;
hp->Type = RIO_AT;
hp->Copy = rio_copy_to_card; /* AT card PCI???? - PVDL
* -- YES! this is now a normal copy. Only the
hp->Type = RIO_AT;
hp->Copy = rio_copy_to_card; /* AT card PCI???? - PVDL
* -- YES! this is now a normal copy. Only the
@@
-1111,7
+1111,7
@@
static int __init rio_init(void)
}
if (!okboard)
}
if (!okboard)
- iounmap(
(char *) (hp->Caddr)
);
+ iounmap(
hp->Caddr
);
}
}
}
}
@@
-1119,7
+1119,7
@@
static int __init rio_init(void)
for (i = 0; i < p->RIONumHosts; i++) {
hp = &p->RIOHosts[i];
if (hp->Ivec) {
for (i = 0; i < p->RIONumHosts; i++) {
hp = &p->RIOHosts[i];
if (hp->Ivec) {
- int mode =
SA_SHIRQ
;
+ int mode =
IRQF_SHARED
;
if (hp->Ivec & 0x8000) {
mode = 0;
hp->Ivec &= 0x7fff;
if (hp->Ivec & 0x8000) {
mode = 0;
hp->Ivec &= 0x7fff;