projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
isdn
/
hisax
/
sportster.c
diff --git
a/drivers/isdn/hisax/sportster.c
b/drivers/isdn/hisax/sportster.c
index cdf35dc564c41d90c910abb53a1fa5923b43005c..0a53759adfa4e72e764d2e25a321cf7d82e41ef3 100644
(file)
--- a/
drivers/isdn/hisax/sportster.c
+++ b/
drivers/isdn/hisax/sportster.c
@@
-18,7
+18,6
@@
#include "hscx.h"
#include "isdnl1.h"
#include "hscx.h"
#include "isdnl1.h"
-extern const char *CardType[];
static const char *sportster_revision = "$Revision: 1.16.2.4 $";
#define byteout(addr,val) outb(val,addr)
static const char *sportster_revision = "$Revision: 1.16.2.4 $";
#define byteout(addr,val) outb(val,addr)
@@
-99,7
+98,7
@@
WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
#include "hscx_irq.c"
static irqreturn_t
-sportster_interrupt(int intno, void *dev_id
, struct pt_regs *regs
)
+sportster_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val;
{
struct IsdnCardState *cs = dev_id;
u_char val;
@@
-184,7
+183,7
@@
Sportster_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return(0);
}
return(0);
}
-static int __init
+static int __
dev
init
get_io_range(struct IsdnCardState *cs)
{
int i, j, adr;
get_io_range(struct IsdnCardState *cs)
{
int i, j, adr;
@@
-192,9
+191,9
@@
get_io_range(struct IsdnCardState *cs)
for (i=0;i<64;i++) {
adr = cs->hw.spt.cfg_reg + i *1024;
if (!request_region(adr, 8, "sportster")) {
for (i=0;i<64;i++) {
adr = cs->hw.spt.cfg_reg + i *1024;
if (!request_region(adr, 8, "sportster")) {
- printk(KERN_WARNING
- "
HiSax: %s config port
%x-%x already in use\n",
-
CardType[cs->typ],
adr, adr + 8);
+ printk(KERN_WARNING
"HiSax: USR Sportster config port "
+ "%x-%x already in use\n",
+ adr, adr + 8);
break;
}
}
break;
}
}
@@
-209,7
+208,7
@@
get_io_range(struct IsdnCardState *cs)
}
}
}
}
-int __init
+int __
dev
init
setup_sportster(struct IsdnCard *card)
{
struct IsdnCardState *cs = card->cs;
setup_sportster(struct IsdnCard *card)
{
struct IsdnCardState *cs = card->cs;
@@
-247,8
+246,8
@@
setup_sportster(struct IsdnCard *card)
printk(KERN_WARNING "Sportster: wrong IRQ\n");
return(0);
}
printk(KERN_WARNING "Sportster: wrong IRQ\n");
return(0);
}
- printk(KERN_INFO "HiSax:
%s
config irq:%d cfg:0x%X\n",
-
CardType[cs->typ],
cs->irq, cs->hw.spt.cfg_reg);
+ printk(KERN_INFO "HiSax:
USR Sportster
config irq:%d cfg:0x%X\n",
+ cs->irq, cs->hw.spt.cfg_reg);
setup_isac(cs);
cs->readisac = &ReadISAC;
cs->writeisac = &WriteISAC;
setup_isac(cs);
cs->readisac = &ReadISAC;
cs->writeisac = &WriteISAC;