From 848d5ae1159748059edff5c0babc4249fc79dcf8 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Thu, 22 Mar 2012 18:36:14 +0000 Subject: [PATCH] wct4xxp: Trivial formatting changes around request_irq. Quiet some checkpatch warnings introduced by the last patch. I kept this separate since it may have obscured the real change made in the previous commit if combined. Signed-off-by: Shaun Ruffell Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10590 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.6@10594 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wct4xxp/base.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index fc6f5c4..9fdd330 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -5236,18 +5236,19 @@ t4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) (wc->numspans == 8) ? "wct8xxp" : (wc->numspans == 2) ? "wct2xxp" : "wct4xxp", - wc)) + wc)) { #else - if (!(wc->tspans[0]->spanflags & FLAG_2NDGEN)) { - dev_notice(&wc->dev->dev, "This driver does not " - "support 1st gen modules\n"); - free_wc(wc); - return -ENODEV; - } - if (request_irq(pdev->irq, t4_interrupt_gen2, DAHDI_IRQ_SHARED, "t4xxp", wc)) + if (!(wc->tspans[0]->spanflags & FLAG_2NDGEN)) { + dev_notice(&wc->dev->dev, "This driver does not " + "support 1st gen modules\n"); + free_wc(wc); + return -ENODEV; + } + + if (request_irq(pdev->irq, t4_interrupt_gen2, + DAHDI_IRQ_SHARED, "t4xxp", wc)) { #endif - { - dev_notice(&wc->dev->dev, "t4xxp: Unable to request IRQ %d\n", + dev_notice(&wc->dev->dev, "Unable to request IRQ %d\n", pdev->irq); free_wc(wc); return -EIO;