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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
isdn
/
hardware
/
eicon
/
divasmain.c
diff --git
a/drivers/isdn/hardware/eicon/divasmain.c
b/drivers/isdn/hardware/eicon/divasmain.c
index
866ae64
..
c9b26e8
100644
(file)
--- a/
drivers/isdn/hardware/eicon/divasmain.c
+++ b/
drivers/isdn/hardware/eicon/divasmain.c
@@
-1,4
+1,4
@@
-/* $Id: divasmain.c,v 1.55.4.
1 2004/05/21 12:15:0
0 armin Exp $
+/* $Id: divasmain.c,v 1.55.4.
6 2005/02/09 19:28:2
0 armin Exp $
*
* Low level driver for Eicon DIVA Server ISDN cards.
*
*
* Low level driver for Eicon DIVA Server ISDN cards.
*
@@
-41,7
+41,7
@@
#include "diva_dma.h"
#include "diva_pci.h"
#include "diva_dma.h"
#include "diva_pci.h"
-static char *main_revision = "$Revision: 1.55.4.
1
$";
+static char *main_revision = "$Revision: 1.55.4.
6
$";
static int major;
static int major;
@@
-51,7
+51,7
@@
MODULE_DESCRIPTION("Kernel driver for Eicon DIVA Server cards");
MODULE_AUTHOR("Cytronics & Melware, Eicon Networks");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Cytronics & Melware, Eicon Networks");
MODULE_LICENSE("GPL");
-
MODULE_PARM(dbgmask, "i"
);
+
module_param(dbgmask, int, 0
);
MODULE_PARM_DESC(dbgmask, "initial debug mask");
static char *DRIVERNAME =
MODULE_PARM_DESC(dbgmask, "initial debug mask");
static char *DRIVERNAME =
@@
-435,16
+435,14
@@
diva_os_register_io_port(void *adapter, int on, unsigned long port,
return (0);
}
return (0);
}
-void *divasa_remap_pci_bar(diva_os_xdi_adapter_t *a, int id, unsigned long bar, unsigned long area_length)
+void
__iomem
*divasa_remap_pci_bar(diva_os_xdi_adapter_t *a, int id, unsigned long bar, unsigned long area_length)
{
{
- void *ret;
-
- ret = (void *) ioremap(bar, area_length);
- DBG_TRC(("remap(%08x)->%08x", bar, ret));
+ void __iomem *ret = ioremap(bar, area_length);
+ DBG_TRC(("remap(%08x)->%p", bar, ret));
return (ret);
}
return (ret);
}
-void divasa_unmap_pci_bar(void *bar)
+void divasa_unmap_pci_bar(void
__iomem
*bar)
{
if (bar) {
iounmap(bar);
{
if (bar) {
iounmap(bar);
@@
-454,32
+452,32
@@
void divasa_unmap_pci_bar(void *bar)
/*********************************************************
** I/O port access
*********************************************************/
/*********************************************************
** I/O port access
*********************************************************/
-byte __inline__ inpp(void *addr)
+byte __inline__ inpp(void
__iomem
*addr)
{
return (inb((unsigned long) addr));
}
{
return (inb((unsigned long) addr));
}
-word __inline__ inppw(void *addr)
+word __inline__ inppw(void
__iomem
*addr)
{
return (inw((unsigned long) addr));
}
{
return (inw((unsigned long) addr));
}
-void __inline__ inppw_buffer(void *addr, void *P, int length)
+void __inline__ inppw_buffer(void
__iomem
*addr, void *P, int length)
{
insw((unsigned long) addr, (word *) P, length >> 1);
}
{
insw((unsigned long) addr, (word *) P, length >> 1);
}
-void __inline__ outppw_buffer(void *addr, void *P, int length)
+void __inline__ outppw_buffer(void
__iomem
*addr, void *P, int length)
{
outsw((unsigned long) addr, (word *) P, length >> 1);
}
{
outsw((unsigned long) addr, (word *) P, length >> 1);
}
-void __inline__ outppw(void *addr, word w)
+void __inline__ outppw(void
__iomem
*addr, word w)
{
outw(w, (unsigned long) addr);
}
{
outw(w, (unsigned long) addr);
}
-void __inline__ outpp(void *addr, word p)
+void __inline__ outpp(void
__iomem
*addr, word p)
{
outb(p, (unsigned long) addr);
}
{
outb(p, (unsigned long) addr);
}
@@
-825,7
+823,7
@@
static int DIVA_INIT_FUNCTION divas_init(void)
goto out;
}
goto out;
}
- if ((ret = pci_
module_init
(&diva_pci_driver))) {
+ if ((ret = pci_
register_driver
(&diva_pci_driver))) {
#ifdef MODULE
remove_divas_proc();
divas_unregister_chrdev();
#ifdef MODULE
remove_divas_proc();
divas_unregister_chrdev();