From 68550819914ea9ee943f16a9b8daef7f91a205bf Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 11 Sep 2012 15:08:06 -0700 Subject: [PATCH] --- yaml --- r: 325207 b: refs/heads/master c: bc4b4aa5f5153d42d03244c2cbb19546f6200aef h: refs/heads/master i: 325205: a9b41fea16e54535efd7dd0e3029aaf2b04d2c37 325203: 5f01650f1350d34826349026fa8c32d39d1f3de9 325199: 90fea2627d38547c84dd0126c3ad0aa46da1bfe7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adv_pci1710.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 3876323d409f..9dd326ff1706 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b84a9ce54430225053667cce146f06d6ee257372 +refs/heads/master: bc4b4aa5f5153d42d03244c2cbb19546f6200aef diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c index 699f267004ad..e589684415ee 100644 --- a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c @@ -1332,8 +1332,6 @@ static int pci1710_attach(struct comedi_device *dev, int ret, subdev, n_subdevices; unsigned int irq; - dev_info(dev->class_dev, DRV_NAME ": attach\n"); - ret = alloc_private(dev, sizeof(*devpriv)); if (ret < 0) return -ENOMEM; @@ -1377,15 +1375,8 @@ static int pci1710_attach(struct comedi_device *dev, if (request_irq(irq, interrupt_service_pci1710, IRQF_SHARED, "Advantech PCI-1710", dev)) { - dev_dbg(dev->class_dev, - "unable to allocate IRQ %d, DISABLING IT", - irq); irq = 0; /* Can't use IRQ */ - } else { - dev_dbg(dev->class_dev, "irq=%u", irq); } - } else { - dev_dbg(dev->class_dev, "IRQ disabled"); } } else { irq = 0; @@ -1480,6 +1471,9 @@ static int pci1710_attach(struct comedi_device *dev, devpriv->valid = 1; + dev_info(dev->class_dev, "%s attached, irq %sabled\n", + dev->board_name, dev->irq ? "en" : "dis"); + return 0; }