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:
@@ -1,4 +1,4 @@
|
||||
/* $Id: nj_u.c,v 2.14.2.3 2004/01/13 14:31:26 keil Exp $
|
||||
/* $Id: nj_u.c,v 2.14.2.3 2004/01/13 14:31:26 keil Exp $
|
||||
*
|
||||
* This software may be used and distributed according to the terms
|
||||
* of the GNU General Public License, incorporated herein by reference.
|
||||
@@ -18,7 +18,7 @@ static const char *NETjet_U_revision = "$Revision: 2.14.2.3 $";
|
||||
|
||||
static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off)
|
||||
{
|
||||
return(5);
|
||||
return (5);
|
||||
}
|
||||
|
||||
static void dummywr(struct IsdnCardState *cs, int chan, u_char off, u_char value)
|
||||
@@ -34,7 +34,7 @@ netjet_u_interrupt(int intno, void *dev_id)
|
||||
|
||||
spin_lock_irqsave(&cs->lock, flags);
|
||||
if (!((sval = bytein(cs->hw.njet.base + NETJET_IRQSTAT1)) &
|
||||
NETJET_ISACIRQ)) {
|
||||
NETJET_ISACIRQ)) {
|
||||
val = NETjet_ReadIC(cs, ICC_ISTA);
|
||||
if (cs->debug & L1_DEB_ISAC)
|
||||
debugl1(cs, "tiger: i1 %x %x", sval, val);
|
||||
@@ -47,17 +47,17 @@ netjet_u_interrupt(int intno, void *dev_id)
|
||||
/* start new code 13/07/00 GE */
|
||||
/* set bits in sval to indicate which page is free */
|
||||
if (inl(cs->hw.njet.base + NETJET_DMA_WRITE_ADR) <
|
||||
inl(cs->hw.njet.base + NETJET_DMA_WRITE_IRQ))
|
||||
inl(cs->hw.njet.base + NETJET_DMA_WRITE_IRQ))
|
||||
/* the 2nd write page is free */
|
||||
sval = 0x08;
|
||||
else /* the 1st write page is free */
|
||||
sval = 0x04;
|
||||
sval = 0x04;
|
||||
if (inl(cs->hw.njet.base + NETJET_DMA_READ_ADR) <
|
||||
inl(cs->hw.njet.base + NETJET_DMA_READ_IRQ))
|
||||
inl(cs->hw.njet.base + NETJET_DMA_READ_IRQ))
|
||||
/* the 2nd read page is free */
|
||||
sval = sval | 0x02;
|
||||
else /* the 1st read page is free */
|
||||
sval = sval | 0x01;
|
||||
sval = sval | 0x01;
|
||||
if (sval != cs->hw.njet.last_is0) /* we have a DMA interrupt */
|
||||
{
|
||||
if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) {
|
||||
@@ -65,12 +65,12 @@ netjet_u_interrupt(int intno, void *dev_id)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
cs->hw.njet.irqstat0 = sval;
|
||||
if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_READ) !=
|
||||
(cs->hw.njet.last_is0 & NETJET_IRQM0_READ))
|
||||
if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_READ) !=
|
||||
(cs->hw.njet.last_is0 & NETJET_IRQM0_READ))
|
||||
/* we have a read dma int */
|
||||
read_tiger(cs);
|
||||
if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_WRITE) !=
|
||||
(cs->hw.njet.last_is0 & NETJET_IRQM0_WRITE))
|
||||
(cs->hw.njet.last_is0 & NETJET_IRQM0_WRITE))
|
||||
/* we have a write dma int */
|
||||
write_tiger(cs);
|
||||
/* end new code 13/07/00 GE */
|
||||
@@ -104,45 +104,45 @@ NETjet_U_card_msg(struct IsdnCardState *cs, int mt, void *arg)
|
||||
u_long flags;
|
||||
|
||||
switch (mt) {
|
||||
case CARD_RESET:
|
||||
spin_lock_irqsave(&cs->lock, flags);
|
||||
reset_netjet_u(cs);
|
||||
spin_unlock_irqrestore(&cs->lock, flags);
|
||||
return(0);
|
||||
case CARD_RELEASE:
|
||||
release_io_netjet(cs);
|
||||
return(0);
|
||||
case CARD_INIT:
|
||||
spin_lock_irqsave(&cs->lock, flags);
|
||||
inittiger(cs);
|
||||
reset_netjet_u(cs);
|
||||
clear_pending_icc_ints(cs);
|
||||
initicc(cs);
|
||||
/* Reenable all IRQ */
|
||||
cs->writeisac(cs, ICC_MASK, 0);
|
||||
spin_unlock_irqrestore(&cs->lock, flags);
|
||||
return(0);
|
||||
case CARD_TEST:
|
||||
return(0);
|
||||
case CARD_RESET:
|
||||
spin_lock_irqsave(&cs->lock, flags);
|
||||
reset_netjet_u(cs);
|
||||
spin_unlock_irqrestore(&cs->lock, flags);
|
||||
return (0);
|
||||
case CARD_RELEASE:
|
||||
release_io_netjet(cs);
|
||||
return (0);
|
||||
case CARD_INIT:
|
||||
spin_lock_irqsave(&cs->lock, flags);
|
||||
inittiger(cs);
|
||||
reset_netjet_u(cs);
|
||||
clear_pending_icc_ints(cs);
|
||||
initicc(cs);
|
||||
/* Reenable all IRQ */
|
||||
cs->writeisac(cs, ICC_MASK, 0);
|
||||
spin_unlock_irqrestore(&cs->lock, flags);
|
||||
return (0);
|
||||
case CARD_TEST:
|
||||
return (0);
|
||||
}
|
||||
return(0);
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int __devinit nju_pci_probe(struct pci_dev *dev_netjet,
|
||||
struct IsdnCardState *cs)
|
||||
{
|
||||
if (pci_enable_device(dev_netjet))
|
||||
return(0);
|
||||
return (0);
|
||||
pci_set_master(dev_netjet);
|
||||
cs->irq = dev_netjet->irq;
|
||||
if (!cs->irq) {
|
||||
printk(KERN_WARNING "NETspider-U: No IRQ for PCI card found\n");
|
||||
return(0);
|
||||
return (0);
|
||||
}
|
||||
cs->hw.njet.base = pci_resource_start(dev_netjet, 0);
|
||||
if (!cs->hw.njet.base) {
|
||||
printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n");
|
||||
return(0);
|
||||
return (0);
|
||||
}
|
||||
|
||||
return (1);
|
||||
@@ -171,18 +171,18 @@ static int __devinit nju_cs_init(struct IsdnCard *card,
|
||||
byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ);
|
||||
byteout(cs->hw.njet.auxa, cs->hw.njet.auxd);
|
||||
|
||||
switch ( ( ( NETjet_ReadIC( cs, ICC_RBCH ) >> 5 ) & 3 ) )
|
||||
switch (((NETjet_ReadIC(cs, ICC_RBCH) >> 5) & 3))
|
||||
{
|
||||
case 3 :
|
||||
return 1; /* end loop */
|
||||
case 3:
|
||||
return 1; /* end loop */
|
||||
|
||||
case 0 :
|
||||
printk( KERN_WARNING "NETspider-U: NETjet-S PCI card found\n" );
|
||||
return -1; /* continue looping */
|
||||
case 0:
|
||||
printk(KERN_WARNING "NETspider-U: NETjet-S PCI card found\n");
|
||||
return -1; /* continue looping */
|
||||
|
||||
default :
|
||||
printk( KERN_WARNING "NETspider-U: No PCI card found\n" );
|
||||
return 0; /* end loop & function */
|
||||
default:
|
||||
printk(KERN_WARNING "NETspider-U: No PCI card found\n");
|
||||
return 0; /* end loop & function */
|
||||
}
|
||||
return 1; /* end loop */
|
||||
}
|
||||
@@ -193,8 +193,8 @@ static int __devinit nju_cs_init_rest(struct IsdnCard *card,
|
||||
const int bytecnt = 256;
|
||||
|
||||
printk(KERN_INFO
|
||||
"NETspider-U: PCI card configured at %#lx IRQ %d\n",
|
||||
cs->hw.njet.base, cs->irq);
|
||||
"NETspider-U: PCI card configured at %#lx IRQ %d\n",
|
||||
cs->hw.njet.base, cs->irq);
|
||||
if (!request_region(cs->hw.njet.base, bytecnt, "netspider-u isdn")) {
|
||||
printk(KERN_WARNING
|
||||
"HiSax: NETspider-U config port %#lx-%#lx "
|
||||
@@ -235,19 +235,19 @@ setup_netjet_u(struct IsdnCard *card)
|
||||
strcpy(tmp, NETjet_U_revision);
|
||||
printk(KERN_INFO "HiSax: Traverse Tech. NETspider-U driver Rev. %s\n", HiSax_getrev(tmp));
|
||||
if (cs->typ != ISDN_CTYPE_NETJET_U)
|
||||
return(0);
|
||||
return (0);
|
||||
test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);
|
||||
|
||||
for ( ;; )
|
||||
for (;;)
|
||||
{
|
||||
if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET,
|
||||
PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) {
|
||||
PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) {
|
||||
ret = nju_pci_probe(dev_netjet, cs);
|
||||
if (!ret)
|
||||
return(0);
|
||||
return (0);
|
||||
} else {
|
||||
printk(KERN_WARNING "NETspider-U: No PCI card found\n");
|
||||
return(0);
|
||||
return (0);
|
||||
}
|
||||
|
||||
ret = nju_cs_init(card, cs);
|
||||
|
Reference in New Issue
Block a user