From patchwork Mon Jun 16 21:39:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4362841 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 16409BEEAA for ; Mon, 16 Jun 2014 21:41:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A61C20179 for ; Mon, 16 Jun 2014 21:41:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 304A320172 for ; Mon, 16 Jun 2014 21:41:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756040AbaFPVkV (ORCPT ); Mon, 16 Jun 2014 17:40:21 -0400 Received: from mail-oa0-f74.google.com ([209.85.219.74]:65146 "EHLO mail-oa0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755780AbaFPVkT (ORCPT ); Mon, 16 Jun 2014 17:40:19 -0400 Received: by mail-oa0-f74.google.com with SMTP id i7so1194367oag.5 for ; Mon, 16 Jun 2014 14:40:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UmS4Sjh0bTJLYePx0YX4mKT1RUBi7GeBPwNIX5HkYeQ=; b=R43S1TvLK4pfRvDmuap4TSDPQF1u5dbluhi4zmdNgkRZti1+fcb1B6LC1drFl8MQ+3 MpWDWKdywI5y/6KFzcqsrYu8BRTL1F8CKtZcXJy5cSxjR/s4yth1NCHH6Ct94xx1+uXh aw+ZFIErmRhBDszzgD4LCYWoX/sKfLkSMSyDxqG3o6BZ2bT/sKKQNKxQgq22DA8+x9sS ne2/RuJ68BBUar7I9uxdLrQ4hXjaMhi1HbJce9NjnIez4QJZbLhqrkwQr8jJ1rh7knOT 73p9JYXzYpTum0HK49PNwyrEvHQwbuwIe5zQjY1NqdnAZL2DV8BMq10OxiKILOQYRP9R ql9g== X-Gm-Message-State: ALoCoQnvD9QWQb6sTIzap9bV+41MSwk9IwBKUPyqnvVQTbb+RwRhxwZuF6G2Ow08bBUhuIUCqvzg X-Received: by 10.182.43.196 with SMTP id y4mr1956563obl.35.1402954818545; Mon, 16 Jun 2014 14:40:18 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id n68si1038172yhj.5.2014.06.16.14.40.18 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Jun 2014 14:40:18 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.72.141]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 5D2FD31C9E4; Mon, 16 Jun 2014 14:40:18 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id F27A580FAE; Mon, 16 Jun 2014 14:40:17 -0700 (PDT) From: Doug Anderson To: Lee Jones 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, Doug Anderson , sameo@linux.intel.com, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] mfd: cros_ec: IRQs for cros_ec should be optional Date: Mon, 16 Jun 2014 14:39:52 -0700 Message-Id: <1402954800-28215-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 In-Reply-To: <1402954800-28215-1-git-send-email-dianders@chromium.org> References: <1402954800-28215-1-git-send-email-dianders@chromium.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Simon Glass --- 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); + 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; }