isdn: whitespace coding style cleanup
isdn source code uses a not-current coding style. Update the coding style used on a per-line basis so that git diff -w shows only elided blank lines at EOF. Done with emacs and some scripts and some typing. Built x86 allyesconfig. No detected change in objdump -d or size. Signed-off-by: Joe Perches <joe@perches.com>
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
* Copyright by Klaus-Peter Nischke, ITK AG
|
||||
* <klaus@nischke.do.eunet.de>
|
||||
* by Karsten Keil <keil@isdn4linux.de>
|
||||
*
|
||||
*
|
||||
* This software may be used and distributed according to the terms
|
||||
* of the GNU General Public License, incorporated herein by reference.
|
||||
*
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
static const char *ix1_revision = "$Revision: 2.12.2.4 $";
|
||||
|
||||
#define byteout(addr,val) outb(val,addr)
|
||||
#define byteout(addr, val) outb(val, addr)
|
||||
#define bytein(addr) inb(addr)
|
||||
|
||||
#define SPECIAL_PORT_OFFSET 3
|
||||
@@ -49,7 +49,7 @@ readreg(unsigned int ale, unsigned int adr, u_char off)
|
||||
}
|
||||
|
||||
static inline void
|
||||
readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size)
|
||||
readfifo(unsigned int ale, unsigned int adr, u_char off, u_char *data, int size)
|
||||
{
|
||||
byteout(ale, off);
|
||||
insb(adr, data, size);
|
||||
@@ -64,7 +64,7 @@ writereg(unsigned int ale, unsigned int adr, u_char off, u_char data)
|
||||
}
|
||||
|
||||
static inline void
|
||||
writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size)
|
||||
writefifo(unsigned int ale, unsigned int adr, u_char off, u_char *data, int size)
|
||||
{
|
||||
byteout(ale, off);
|
||||
outsb(adr, data, size);
|
||||
@@ -85,13 +85,13 @@ WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value)
|
||||
}
|
||||
|
||||
static void
|
||||
ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size)
|
||||
ReadISACfifo(struct IsdnCardState *cs, u_char *data, int size)
|
||||
{
|
||||
readfifo(cs->hw.ix1.isac_ale, cs->hw.ix1.isac, 0, data, size);
|
||||
}
|
||||
|
||||
static void
|
||||
WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size)
|
||||
WriteISACfifo(struct IsdnCardState *cs, u_char *data, int size)
|
||||
{
|
||||
writefifo(cs->hw.ix1.isac_ale, cs->hw.ix1.isac, 0, data, size);
|
||||
}
|
||||
@@ -110,16 +110,16 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
|
||||
cs->hw.ix1.hscx, offset + (hscx ? 0x40 : 0), value);
|
||||
}
|
||||
|
||||
#define READHSCX(cs, nr, reg) readreg(cs->hw.ix1.hscx_ale, \
|
||||
cs->hw.ix1.hscx, reg + (nr ? 0x40 : 0))
|
||||
#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.ix1.hscx_ale, \
|
||||
cs->hw.ix1.hscx, reg + (nr ? 0x40 : 0), data)
|
||||
#define READHSCX(cs, nr, reg) readreg(cs->hw.ix1.hscx_ale, \
|
||||
cs->hw.ix1.hscx, reg + (nr ? 0x40 : 0))
|
||||
#define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.ix1.hscx_ale, \
|
||||
cs->hw.ix1.hscx, reg + (nr ? 0x40 : 0), data)
|
||||
|
||||
#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.ix1.hscx_ale, \
|
||||
cs->hw.ix1.hscx, (nr ? 0x40 : 0), ptr, cnt)
|
||||
#define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.ix1.hscx_ale, \
|
||||
cs->hw.ix1.hscx, (nr ? 0x40 : 0), ptr, cnt)
|
||||
|
||||
#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.ix1.hscx_ale, \
|
||||
cs->hw.ix1.hscx, (nr ? 0x40 : 0), ptr, cnt)
|
||||
#define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.ix1.hscx_ale, \
|
||||
cs->hw.ix1.hscx, (nr ? 0x40 : 0), ptr, cnt)
|
||||
|
||||
#include "hscx_irq.c"
|
||||
|
||||
@@ -132,11 +132,11 @@ ix1micro_interrupt(int intno, void *dev_id)
|
||||
|
||||
spin_lock_irqsave(&cs->lock, flags);
|
||||
val = readreg(cs->hw.ix1.hscx_ale, cs->hw.ix1.hscx, HSCX_ISTA + 0x40);
|
||||
Start_HSCX:
|
||||
Start_HSCX:
|
||||
if (val)
|
||||
hscx_int_main(cs, val);
|
||||
val = readreg(cs->hw.ix1.isac_ale, cs->hw.ix1.isac, ISAC_ISTA);
|
||||
Start_ISAC:
|
||||
Start_ISAC:
|
||||
if (val)
|
||||
isac_interrupt(cs, val);
|
||||
val = readreg(cs->hw.ix1.hscx_ale, cs->hw.ix1.hscx, HSCX_ISTA + 0x40);
|
||||
@@ -188,33 +188,33 @@ ix1_card_msg(struct IsdnCardState *cs, int mt, void *arg)
|
||||
u_long flags;
|
||||
|
||||
switch (mt) {
|
||||
case CARD_RESET:
|
||||
spin_lock_irqsave(&cs->lock, flags);
|
||||
ix1_reset(cs);
|
||||
spin_unlock_irqrestore(&cs->lock, flags);
|
||||
return(0);
|
||||
case CARD_RELEASE:
|
||||
release_io_ix1micro(cs);
|
||||
return(0);
|
||||
case CARD_INIT:
|
||||
spin_lock_irqsave(&cs->lock, flags);
|
||||
ix1_reset(cs);
|
||||
inithscxisac(cs, 3);
|
||||
spin_unlock_irqrestore(&cs->lock, flags);
|
||||
return(0);
|
||||
case CARD_TEST:
|
||||
return(0);
|
||||
case CARD_RESET:
|
||||
spin_lock_irqsave(&cs->lock, flags);
|
||||
ix1_reset(cs);
|
||||
spin_unlock_irqrestore(&cs->lock, flags);
|
||||
return (0);
|
||||
case CARD_RELEASE:
|
||||
release_io_ix1micro(cs);
|
||||
return (0);
|
||||
case CARD_INIT:
|
||||
spin_lock_irqsave(&cs->lock, flags);
|
||||
ix1_reset(cs);
|
||||
inithscxisac(cs, 3);
|
||||
spin_unlock_irqrestore(&cs->lock, flags);
|
||||
return (0);
|
||||
case CARD_TEST:
|
||||
return (0);
|
||||
}
|
||||
return(0);
|
||||
return (0);
|
||||
}
|
||||
|
||||
#ifdef __ISAPNP__
|
||||
static struct isapnp_device_id itk_ids[] __devinitdata = {
|
||||
{ ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),
|
||||
ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),
|
||||
ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),
|
||||
(unsigned long) "ITK micro 2" },
|
||||
{ ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x29),
|
||||
ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x29),
|
||||
ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x29),
|
||||
(unsigned long) "ITK micro 2." },
|
||||
{ 0, }
|
||||
};
|
||||
@@ -238,30 +238,30 @@ setup_ix1micro(struct IsdnCard *card)
|
||||
#ifdef __ISAPNP__
|
||||
if (!card->para[1] && isapnp_present()) {
|
||||
struct pnp_dev *pnp_d;
|
||||
while(ipid->card_vendor) {
|
||||
while (ipid->card_vendor) {
|
||||
if ((pnp_c = pnp_find_card(ipid->card_vendor,
|
||||
ipid->card_device, pnp_c))) {
|
||||
ipid->card_device, pnp_c))) {
|
||||
pnp_d = NULL;
|
||||
if ((pnp_d = pnp_find_dev(pnp_c,
|
||||
ipid->vendor, ipid->function, pnp_d))) {
|
||||
ipid->vendor, ipid->function, pnp_d))) {
|
||||
int err;
|
||||
|
||||
printk(KERN_INFO "HiSax: %s detected\n",
|
||||
(char *)ipid->driver_data);
|
||||
(char *)ipid->driver_data);
|
||||
pnp_disable_dev(pnp_d);
|
||||
err = pnp_activate_dev(pnp_d);
|
||||
if (err<0) {
|
||||
if (err < 0) {
|
||||
printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
|
||||
__func__, err);
|
||||
return(0);
|
||||
__func__, err);
|
||||
return (0);
|
||||
}
|
||||
card->para[1] = pnp_port_start(pnp_d, 0);
|
||||
card->para[0] = pnp_irq(pnp_d, 0);
|
||||
if (!card->para[0] || !card->para[1]) {
|
||||
printk(KERN_ERR "ITK PnP:some resources are missing %ld/%lx\n",
|
||||
card->para[0], card->para[1]);
|
||||
card->para[0], card->para[1]);
|
||||
pnp_disable_dev(pnp_d);
|
||||
return(0);
|
||||
return (0);
|
||||
}
|
||||
break;
|
||||
} else {
|
||||
@@ -270,10 +270,10 @@ setup_ix1micro(struct IsdnCard *card)
|
||||
}
|
||||
ipid++;
|
||||
pnp_c = NULL;
|
||||
}
|
||||
}
|
||||
if (!ipid->card_vendor) {
|
||||
printk(KERN_INFO "ITK PnP: no ISAPnP card found\n");
|
||||
return(0);
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -287,15 +287,15 @@ setup_ix1micro(struct IsdnCard *card)
|
||||
if (cs->hw.ix1.cfg_reg) {
|
||||
if (!request_region(cs->hw.ix1.cfg_reg, 4, "ix1micro cfg")) {
|
||||
printk(KERN_WARNING
|
||||
"HiSax: ITK ix1-micro Rev.2 config port "
|
||||
"%x-%x already in use\n",
|
||||
"HiSax: ITK ix1-micro Rev.2 config port "
|
||||
"%x-%x already in use\n",
|
||||
cs->hw.ix1.cfg_reg,
|
||||
cs->hw.ix1.cfg_reg + 4);
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
printk(KERN_INFO "HiSax: ITK ix1-micro Rev.2 config irq:%d io:0x%X\n",
|
||||
cs->irq, cs->hw.ix1.cfg_reg);
|
||||
cs->irq, cs->hw.ix1.cfg_reg);
|
||||
setup_isac(cs);
|
||||
cs->readisac = &ReadISAC;
|
||||
cs->writeisac = &WriteISAC;
|
||||
@@ -309,7 +309,7 @@ setup_ix1micro(struct IsdnCard *card)
|
||||
ISACVersion(cs, "ix1-Micro:");
|
||||
if (HscxVersion(cs, "ix1-Micro:")) {
|
||||
printk(KERN_WARNING
|
||||
"ix1-Micro: wrong HSCX versions check IO address\n");
|
||||
"ix1-Micro: wrong HSCX versions check IO address\n");
|
||||
release_io_ix1micro(cs);
|
||||
return (0);
|
||||
}
|
||||
|
Reference in New Issue
Block a user