summaryrefslogtreecommitdiff
path: root/drivers/isdn/hardware/avm/b1pci.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-02-20 07:52:38 +0400
committerJoe Perches <joe@perches.com>2012-02-21 21:04:01 +0400
commit475be4d85a274d0961593db41cf85689db1d583c (patch)
treeb2b8931eb747794730522c3cf1898e46948527b9 /drivers/isdn/hardware/avm/b1pci.c
parent0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff)
downloadlinux-475be4d85a274d0961593db41cf85689db1d583c.tar.xz
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>
Diffstat (limited to 'drivers/isdn/hardware/avm/b1pci.c')
-rw-r--r--drivers/isdn/hardware/avm/b1pci.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/isdn/hardware/avm/b1pci.c b/drivers/isdn/hardware/avm/b1pci.c
index c97e4315079d..b305e6b2b8ee 100644
--- a/drivers/isdn/hardware/avm/b1pci.c
+++ b/drivers/isdn/hardware/avm/b1pci.c
@@ -1,9 +1,9 @@
/* $Id: b1pci.c,v 1.1.2.2 2004/01/16 21:09:27 keil Exp $
- *
+ *
* Module for AVM B1 PCI-card.
- *
+ *
* Copyright 1999 by Carsten Paeth <calle@calle.de>
- *
+ *
* This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference.
*
@@ -79,7 +79,7 @@ static int b1pci_probe(struct capicardparams *p, struct pci_dev *pdev)
card->port = p->port;
card->irq = p->irq;
card->cardtype = avm_b1pci;
-
+
if (!request_region(card->port, AVMB1_PORTLEN, card->name)) {
printk(KERN_WARNING "b1pci: ports 0x%03x-0x%03x in use.\n",
card->port, card->port + AVMB1_PORTLEN);
@@ -96,14 +96,14 @@ static int b1pci_probe(struct capicardparams *p, struct pci_dev *pdev)
}
b1_reset(card->port);
b1_getrevision(card);
-
+
retval = request_irq(card->irq, b1_interrupt, IRQF_SHARED, card->name, card);
if (retval) {
printk(KERN_ERR "b1pci: unable to get IRQ %d.\n", card->irq);
retval = -EBUSY;
goto err_release_region;
}
-
+
cinfo->capi_ctrl.driver_name = "b1pci";
cinfo->capi_ctrl.driverdata = cinfo;
cinfo->capi_ctrl.register_appl = b1_register_appl;
@@ -133,13 +133,13 @@ static int b1pci_probe(struct capicardparams *p, struct pci_dev *pdev)
pci_set_drvdata(pdev, card);
return 0;
- err_free_irq:
+err_free_irq:
free_irq(card->irq, card);
- err_release_region:
+err_release_region:
release_region(card->port, AVMB1_PORTLEN);
- err_free:
+err_free:
b1_free_card(card);
- err:
+err:
return retval;
}
@@ -193,7 +193,7 @@ static int b1pciv4_probe(struct capicardparams *p, struct pci_dev *pdev)
goto err;
}
- card->dma = avmcard_dma_alloc("b1pci", pdev, 2048+128, 2048+128);
+ card->dma = avmcard_dma_alloc("b1pci", pdev, 2048 + 128, 2048 + 128);
if (!card->dma) {
printk(KERN_WARNING "b1pci: dma alloc.\n");
retval = -ENOMEM;
@@ -267,17 +267,17 @@ static int b1pciv4_probe(struct capicardparams *p, struct pci_dev *pdev)
pci_set_drvdata(pdev, card);
return 0;
- err_free_irq:
+err_free_irq:
free_irq(card->irq, card);
- err_unmap:
+err_unmap:
iounmap(card->mbase);
- err_release_region:
+err_release_region:
release_region(card->port, AVMB1_PORTLEN);
- err_free_dma:
+err_free_dma:
avmcard_dma_free(card->dma);
- err_free:
+err_free:
b1_free_card(card);
- err:
+err:
return retval;
}
@@ -287,13 +287,13 @@ static void b1pciv4_remove(struct pci_dev *pdev)
avmcard *card = pci_get_drvdata(pdev);
avmctrl_info *cinfo = card->ctrlinfo;
- b1dma_reset(card);
+ b1dma_reset(card);
detach_capi_ctr(&cinfo->capi_ctrl);
free_irq(card->irq, card);
iounmap(card->mbase);
release_region(card->port, AVMB1_PORTLEN);
- avmcard_dma_free(card->dma);
+ avmcard_dma_free(card->dma);
b1_free_card(card);
}
@@ -326,7 +326,7 @@ static int __devinit b1pci_pci_probe(struct pci_dev *pdev,
retval = b1pci_probe(&param, pdev);
#endif
if (retval != 0) {
- printk(KERN_ERR "b1pci: no AVM-B1 V4 at i/o %#x, irq %d, mem %#x detected\n",
+ printk(KERN_ERR "b1pci: no AVM-B1 V4 at i/o %#x, irq %d, mem %#x detected\n",
param.port, param.irq, param.membase);
}
} else {
@@ -337,7 +337,7 @@ static int __devinit b1pci_pci_probe(struct pci_dev *pdev,
param.port, param.irq);
retval = b1pci_probe(&param, pdev);
if (retval != 0) {
- printk(KERN_ERR "b1pci: no AVM-B1 at i/o %#x, irq %d detected\n",
+ printk(KERN_ERR "b1pci: no AVM-B1 at i/o %#x, irq %d detected\n",
param.port, param.irq);
}
}
@@ -385,7 +385,7 @@ static int __init b1pci_init(void)
if ((p = strchr(revision, ':')) != NULL && p[1]) {
strlcpy(rev, p + 2, 32);
if ((p = strchr(rev, '$')) != NULL && p > rev)
- *(p-1) = 0;
+ *(p - 1) = 0;
} else
strcpy(rev, "1.0");