diff options
author | Joe Perches <joe@perches.com> | 2012-02-19 22:52:38 -0500 |
---|---|---|
committer | Joe Perches <joe@perches.com> | 2012-02-21 12:04:01 -0500 |
commit | 475be4d85a274d0961593db41cf85689db1d583c (patch) | |
tree | b2b8931eb747794730522c3cf1898e46948527b9 /drivers/isdn/hardware/mISDN/mISDNinfineon.c | |
parent | 0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff) |
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/mISDN/mISDNinfineon.c')
-rw-r--r-- | drivers/isdn/hardware/mISDN/mISDNinfineon.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c index 6218775ce87d..631eb3fa63cf 100644 --- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c +++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c | |||
@@ -431,11 +431,11 @@ enable_hwirq(struct inf_hw *hw) | |||
431 | break; | 431 | break; |
432 | case INF_GAZEL_R685: | 432 | case INF_GAZEL_R685: |
433 | outb(GAZEL_ISAC_EN + GAZEL_HSCX_EN + GAZEL_PCI_EN, | 433 | outb(GAZEL_ISAC_EN + GAZEL_HSCX_EN + GAZEL_PCI_EN, |
434 | (u32)hw->cfg.start + GAZEL_INCSR); | 434 | (u32)hw->cfg.start + GAZEL_INCSR); |
435 | break; | 435 | break; |
436 | case INF_GAZEL_R753: | 436 | case INF_GAZEL_R753: |
437 | outb(GAZEL_IPAC_EN + GAZEL_PCI_EN, | 437 | outb(GAZEL_IPAC_EN + GAZEL_PCI_EN, |
438 | (u32)hw->cfg.start + GAZEL_INCSR); | 438 | (u32)hw->cfg.start + GAZEL_INCSR); |
439 | break; | 439 | break; |
440 | default: | 440 | default: |
441 | break; | 441 | break; |
@@ -511,21 +511,21 @@ reset_inf(struct inf_hw *hw) | |||
511 | /* Workaround PCI9060 */ | 511 | /* Workaround PCI9060 */ |
512 | outb(9, (u32)hw->cfg.start + 0x69); | 512 | outb(9, (u32)hw->cfg.start + 0x69); |
513 | outb(DIVA_RESET_BIT | DIVA_LED_A, | 513 | outb(DIVA_RESET_BIT | DIVA_LED_A, |
514 | (u32)hw->cfg.start + DIVA_PCI_CTRL); | 514 | (u32)hw->cfg.start + DIVA_PCI_CTRL); |
515 | break; | 515 | break; |
516 | case INF_DIVA201: | 516 | case INF_DIVA201: |
517 | writel(PITA_PARA_SOFTRESET | PITA_PARA_MPX_MODE, | 517 | writel(PITA_PARA_SOFTRESET | PITA_PARA_MPX_MODE, |
518 | hw->cfg.p + PITA_MISC_REG); | 518 | hw->cfg.p + PITA_MISC_REG); |
519 | mdelay(1); | 519 | mdelay(1); |
520 | writel(PITA_PARA_MPX_MODE, hw->cfg.p + PITA_MISC_REG); | 520 | writel(PITA_PARA_MPX_MODE, hw->cfg.p + PITA_MISC_REG); |
521 | mdelay(10); | 521 | mdelay(10); |
522 | break; | 522 | break; |
523 | case INF_DIVA202: | 523 | case INF_DIVA202: |
524 | writel(PITA_PARA_SOFTRESET | PITA_PARA_MPX_MODE, | 524 | writel(PITA_PARA_SOFTRESET | PITA_PARA_MPX_MODE, |
525 | hw->cfg.p + PITA_MISC_REG); | 525 | hw->cfg.p + PITA_MISC_REG); |
526 | mdelay(1); | 526 | mdelay(1); |
527 | writel(PITA_PARA_MPX_MODE | PITA_SER_SOFTRESET, | 527 | writel(PITA_PARA_MPX_MODE | PITA_SER_SOFTRESET, |
528 | hw->cfg.p + PITA_MISC_REG); | 528 | hw->cfg.p + PITA_MISC_REG); |
529 | mdelay(10); | 529 | mdelay(10); |
530 | break; | 530 | break; |
531 | case INF_SPEEDWIN: | 531 | case INF_SPEEDWIN: |
@@ -630,7 +630,7 @@ init_irq(struct inf_hw *hw) | |||
630 | msleep_interruptible(10); | 630 | msleep_interruptible(10); |
631 | if (debug & DEBUG_HW) | 631 | if (debug & DEBUG_HW) |
632 | pr_notice("%s: IRQ %d count %d\n", hw->name, | 632 | pr_notice("%s: IRQ %d count %d\n", hw->name, |
633 | hw->irq, hw->irqcnt); | 633 | hw->irq, hw->irqcnt); |
634 | if (!hw->irqcnt) { | 634 | if (!hw->irqcnt) { |
635 | pr_info("%s: IRQ(%d) got no requests during init %d\n", | 635 | pr_info("%s: IRQ(%d) got no requests during init %d\n", |
636 | hw->name, hw->irq, 3 - cnt); | 636 | hw->name, hw->irq, 3 - cnt); |
@@ -672,11 +672,11 @@ setup_io(struct inf_hw *hw) | |||
672 | hw->cfg.size = pci_resource_len(hw->pdev, hw->ci->cfg_bar); | 672 | hw->cfg.size = pci_resource_len(hw->pdev, hw->ci->cfg_bar); |
673 | if (hw->ci->cfg_mode == AM_MEMIO) { | 673 | if (hw->ci->cfg_mode == AM_MEMIO) { |
674 | if (!request_mem_region(hw->cfg.start, hw->cfg.size, | 674 | if (!request_mem_region(hw->cfg.start, hw->cfg.size, |
675 | hw->name)) | 675 | hw->name)) |
676 | err = -EBUSY; | 676 | err = -EBUSY; |
677 | } else { | 677 | } else { |
678 | if (!request_region(hw->cfg.start, hw->cfg.size, | 678 | if (!request_region(hw->cfg.start, hw->cfg.size, |
679 | hw->name)) | 679 | hw->name)) |
680 | err = -EBUSY; | 680 | err = -EBUSY; |
681 | } | 681 | } |
682 | if (err) { | 682 | if (err) { |
@@ -690,8 +690,8 @@ setup_io(struct inf_hw *hw) | |||
690 | hw->cfg.mode = hw->ci->cfg_mode; | 690 | hw->cfg.mode = hw->ci->cfg_mode; |
691 | if (debug & DEBUG_HW) | 691 | if (debug & DEBUG_HW) |
692 | pr_notice("%s: IO cfg %lx (%lu bytes) mode%d\n", | 692 | pr_notice("%s: IO cfg %lx (%lu bytes) mode%d\n", |
693 | hw->name, (ulong)hw->cfg.start, | 693 | hw->name, (ulong)hw->cfg.start, |
694 | (ulong)hw->cfg.size, hw->ci->cfg_mode); | 694 | (ulong)hw->cfg.size, hw->ci->cfg_mode); |
695 | 695 | ||
696 | } | 696 | } |
697 | if (hw->ci->addr_mode) { | 697 | if (hw->ci->addr_mode) { |
@@ -699,11 +699,11 @@ setup_io(struct inf_hw *hw) | |||
699 | hw->addr.size = pci_resource_len(hw->pdev, hw->ci->addr_bar); | 699 | hw->addr.size = pci_resource_len(hw->pdev, hw->ci->addr_bar); |
700 | if (hw->ci->addr_mode == AM_MEMIO) { | 700 | if (hw->ci->addr_mode == AM_MEMIO) { |
701 | if (!request_mem_region(hw->addr.start, hw->addr.size, | 701 | if (!request_mem_region(hw->addr.start, hw->addr.size, |
702 | hw->name)) | 702 | hw->name)) |
703 | err = -EBUSY; | 703 | err = -EBUSY; |
704 | } else { | 704 | } else { |
705 | if (!request_region(hw->addr.start, hw->addr.size, | 705 | if (!request_region(hw->addr.start, hw->addr.size, |
706 | hw->name)) | 706 | hw->name)) |
707 | err = -EBUSY; | 707 | err = -EBUSY; |
708 | } | 708 | } |
709 | if (err) { | 709 | if (err) { |
@@ -717,8 +717,8 @@ setup_io(struct inf_hw *hw) | |||
717 | hw->addr.mode = hw->ci->addr_mode; | 717 | hw->addr.mode = hw->ci->addr_mode; |
718 | if (debug & DEBUG_HW) | 718 | if (debug & DEBUG_HW) |
719 | pr_notice("%s: IO addr %lx (%lu bytes) mode%d\n", | 719 | pr_notice("%s: IO addr %lx (%lu bytes) mode%d\n", |
720 | hw->name, (ulong)hw->addr.start, | 720 | hw->name, (ulong)hw->addr.start, |
721 | (ulong)hw->addr.size, hw->ci->addr_mode); | 721 | (ulong)hw->addr.size, hw->ci->addr_mode); |
722 | 722 | ||
723 | } | 723 | } |
724 | 724 | ||
@@ -903,7 +903,7 @@ setup_instance(struct inf_hw *card) | |||
903 | ulong flags; | 903 | ulong flags; |
904 | 904 | ||
905 | snprintf(card->name, MISDN_MAX_IDLEN - 1, "%s.%d", card->ci->name, | 905 | snprintf(card->name, MISDN_MAX_IDLEN - 1, "%s.%d", card->ci->name, |
906 | inf_cnt + 1); | 906 | inf_cnt + 1); |
907 | write_lock_irqsave(&card_lock, flags); | 907 | write_lock_irqsave(&card_lock, flags); |
908 | list_add_tail(&card->list, &Cards); | 908 | list_add_tail(&card->list, &Cards); |
909 | write_unlock_irqrestore(&card_lock, flags); | 909 | write_unlock_irqrestore(&card_lock, flags); |
@@ -928,7 +928,7 @@ setup_instance(struct inf_hw *card) | |||
928 | goto error_setup; | 928 | goto error_setup; |
929 | 929 | ||
930 | err = mISDN_register_device(&card->ipac.isac.dch.dev, | 930 | err = mISDN_register_device(&card->ipac.isac.dch.dev, |
931 | &card->pdev->dev, card->name); | 931 | &card->pdev->dev, card->name); |
932 | if (err) | 932 | if (err) |
933 | goto error; | 933 | goto error; |
934 | 934 | ||
@@ -1099,7 +1099,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1099 | return -EINVAL; | 1099 | return -EINVAL; |
1100 | } else | 1100 | } else |
1101 | pr_notice("mISDN: found adapter %s at %s\n", | 1101 | pr_notice("mISDN: found adapter %s at %s\n", |
1102 | card->ci->full, pci_name(pdev)); | 1102 | card->ci->full, pci_name(pdev)); |
1103 | 1103 | ||
1104 | card->irq = pdev->irq; | 1104 | card->irq = pdev->irq; |
1105 | pci_set_drvdata(pdev, card); | 1105 | pci_set_drvdata(pdev, card); |