[svn-commits] sruffell: branch linux/2.6 r10594 - /linux/branches/2.6/drivers/dahdi/wct4xxp/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Mar 22 13:36:18 CDT 2012
Author: sruffell
Date: Thu Mar 22 13:36:14 2012
New Revision: 10594
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10594
Log:
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 <sruffell at digium.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10590
Modified:
linux/branches/2.6/drivers/dahdi/wct4xxp/base.c
Modified: linux/branches/2.6/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.6/drivers/dahdi/wct4xxp/base.c?view=diff&rev=10594&r1=10593&r2=10594
==============================================================================
--- linux/branches/2.6/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/branches/2.6/drivers/dahdi/wct4xxp/base.c Thu Mar 22 13:36:14 2012
@@ -5236,18 +5236,19 @@
(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))
-#endif
- {
- dev_notice(&wc->dev->dev, "t4xxp: Unable to request IRQ %d\n",
+ 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, "Unable to request IRQ %d\n",
pdev->irq);
free_wc(wc);
return -EIO;
More information about the svn-commits
mailing list