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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hardware
/
avm
/
c4.c
diff --git
a/drivers/isdn/hardware/avm/c4.c
b/drivers/isdn/hardware/avm/c4.c
index
0e40aca
..
2a3eb38
100644
(file)
--- a/
drivers/isdn/hardware/avm/c4.c
+++ b/
drivers/isdn/hardware/avm/c4.c
@@
-9,7
+9,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
@@
-50,7
+49,7
@@
MODULE_DEVICE_TABLE(pci, c4_pci_tbl);
MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM C2/C4 cards");
MODULE_AUTHOR("Carsten Paeth");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM C2/C4 cards");
MODULE_AUTHOR("Carsten Paeth");
MODULE_LICENSE("GPL");
-
MODULE_PARM(suppress_pollack, "0-1i"
);
+
module_param(suppress_pollack, bool, 0
);
/* ------------------------------------------------------------- */
/* ------------------------------------------------------------- */
@@
-714,7
+713,7
@@
static irqreturn_t c4_handle_interrupt(avmcard *card)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t c4_interrupt(int interrupt, void *devptr
, struct pt_regs *regs
)
+static irqreturn_t c4_interrupt(int interrupt, void *devptr)
{
avmcard *card = devptr;
{
avmcard *card = devptr;
@@
-885,7
+884,7
@@
static int c4_load_firmware(struct capi_ctr *ctrl, capiloaddata *data)
}
}
-void c4_reset_ctr(struct capi_ctr *ctrl)
+
static
void c4_reset_ctr(struct capi_ctr *ctrl)
{
avmcard *card = ((avmctrl_info *)(ctrl->driverdata))->card;
avmctrl_info *cinfo;
{
avmcard *card = ((avmctrl_info *)(ctrl->driverdata))->card;
avmctrl_info *cinfo;
@@
-933,7
+932,7
@@
static void c4_remove(struct pci_dev *pdev)
/* ------------------------------------------------------------- */
/* ------------------------------------------------------------- */
-void c4_register_appl(struct capi_ctr *ctrl,
+
static
void c4_register_appl(struct capi_ctr *ctrl,
u16 appl,
capi_register_params *rp)
{
u16 appl,
capi_register_params *rp)
{
@@
-978,7
+977,7
@@
void c4_register_appl(struct capi_ctr *ctrl,
/* ------------------------------------------------------------- */
/* ------------------------------------------------------------- */
-void c4_release_appl(struct capi_ctr *ctrl, u16 appl)
+
static
void c4_release_appl(struct capi_ctr *ctrl, u16 appl)
{
avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
avmcard *card = cinfo->card;
{
avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
avmcard *card = cinfo->card;
@@
-1173,7
+1172,7
@@
static int c4_add_card(struct capicardparams *p, struct pci_dev *dev,
}
c4_reset(card);
}
c4_reset(card);
- retval = request_irq(card->irq, c4_interrupt,
SA_SHIRQ
, card->name, card);
+ retval = request_irq(card->irq, c4_interrupt,
IRQF_SHARED
, card->name, card);
if (retval) {
printk(KERN_ERR "c4: unable to get IRQ %d.\n",card->irq);
retval = -EBUSY;
if (retval) {
printk(KERN_ERR "c4: unable to get IRQ %d.\n",card->irq);
retval = -EBUSY;
@@
-1288,7
+1287,7
@@
static int __init c4_init(void)
} else
strcpy(rev, "1.0");
} else
strcpy(rev, "1.0");
- err = pci_
module_init
(&c4_pci_driver);
+ err = pci_
register_driver
(&c4_pci_driver);
if (!err) {
strlcpy(capi_driver_c2.revision, rev, 32);
register_capi_driver(&capi_driver_c2);
if (!err) {
strlcpy(capi_driver_c2.revision, rev, 32);
register_capi_driver(&capi_driver_c2);