Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964992AbaFRH4T (ORCPT ); Wed, 18 Jun 2014 03:56:19 -0400 Received: from mail-ig0-f175.google.com ([209.85.213.175]:33337 "EHLO mail-ig0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756181AbaFRHz6 (ORCPT ); Wed, 18 Jun 2014 03:55:58 -0400 Date: Wed, 18 Jun 2014 08:55:51 +0100 From: Lee Jones To: Doug Anderson Cc: Andrew Bresticker , swarren@wwwdotorg.org, olof@lixom.net, Sonny Rao , linux-samsung-soc@vger.kernel.org, Javier Martinez Canillas , Bill Richardson , sjg@chromium.org, Wolfram Sang , broonie@kernel.org, sameo@linux.intel.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH 02/10] mfd: cros_ec: IRQs for cros_ec should be optional Message-ID: <20140618075551.GJ21030@lee--X1> References: <1402954800-28215-1-git-send-email-dianders@chromium.org> <1402954800-28215-3-git-send-email-dianders@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1402954800-28215-3-git-send-email-dianders@chromium.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 16 Jun 2014, Doug Anderson wrote: > From: Bill Richardson > > Preparing the way for the LPC device, which is just a plaform_device without > interrupts. > > Signed-off-by: Bill Richardson > Signed-off-by: Doug Anderson > --- > drivers/mfd/cros_ec.c | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c > index 38fe9bf..bd6f936 100644 > --- a/drivers/mfd/cros_ec.c > +++ b/drivers/mfd/cros_ec.c > @@ -119,17 +119,15 @@ int cros_ec_register(struct cros_ec_device *ec_dev) > return -ENOMEM; > } > > - if (!ec_dev->irq) { > - dev_dbg(dev, "no valid IRQ: %d\n", ec_dev->irq); > - return err; > - } > - > - err = request_threaded_irq(ec_dev->irq, NULL, ec_irq_thread, > - IRQF_TRIGGER_LOW | IRQF_ONESHOT, > - "chromeos-ec", ec_dev); > - if (err) { > - dev_err(dev, "request irq %d: error %d\n", ec_dev->irq, err); > - return err; > + if (ec_dev->irq) { > + err = request_threaded_irq(ec_dev->irq, NULL, ec_irq_thread, > + IRQF_TRIGGER_LOW | IRQF_ONESHOT, > + "chromeos-ec", ec_dev); Is there anything stopping you using the devm_* version? > + if (err) { > + dev_err(dev, "request irq %d: error %d\n", > + ec_dev->irq, err); > + return err; > + } > } > > err = mfd_add_devices(dev, 0, cros_devs, > @@ -145,7 +143,8 @@ int cros_ec_register(struct cros_ec_device *ec_dev) > return 0; > > fail_mfd: > - free_irq(ec_dev->irq, ec_dev); > + if (ec_dev->irq) > + free_irq(ec_dev->irq, ec_dev); > > return err; > } > @@ -154,7 +153,8 @@ EXPORT_SYMBOL(cros_ec_register); > int cros_ec_remove(struct cros_ec_device *ec_dev) > { > mfd_remove_devices(ec_dev->dev); > - free_irq(ec_dev->irq, ec_dev); > + if (ec_dev->irq) > + free_irq(ec_dev->irq, ec_dev); > > return 0; > } -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/