From patchwork Tue Apr 21 15:42:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 463363 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D389D14011D for ; Wed, 22 Apr 2015 01:46:05 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=Xb4Hb9tE; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933233AbbDUPoI (ORCPT ); Tue, 21 Apr 2015 11:44:08 -0400 Received: from mail-la0-f52.google.com ([209.85.215.52]:34619 "EHLO mail-la0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933222AbbDUPoG (ORCPT ); Tue, 21 Apr 2015 11:44:06 -0400 Received: by laat2 with SMTP id t2so154342426laa.1; Tue, 21 Apr 2015 08:44:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=55rYP13Vv3utCmiIQoVlKiO4Griz9dEzBmcoDOBvkdE=; b=Xb4Hb9tEebVNbxqbV3BeOPaTeYf76dgnba3y5fUS7wgjTID9lOtO4JT5WQ2r0JWI+I lrMOzkGpuggR82uqYwfhZnm7H9ZGt0U4Ber79kq3BbDwF0pkftvUvvlffTk4gGJh5pmo Ln643pRtpbly9tEnzfrIJRf57chQmLdp2wMUsI+7rSAy/MduM1vJ7NH9AjwCHVy+MjJZ tqDAiN0hzLibeU/og22Qq0QoNfvPEtSLxcDtEE2+gOIJt1zqDiwziR6l2mXVZBU3O3at wToyHpvWECycP97ZLEiJ8E7Ff4mY/PK4eBvnZEeWpRFyTFnkaWS96vIWu7z9j6BFpQu3 X7pg== X-Received: by 10.112.16.196 with SMTP id i4mr20353119lbd.72.1429631045112; Tue, 21 Apr 2015 08:44:05 -0700 (PDT) Received: from xi.terra (c193-14-96-226.cust.tele2.se. [193.14.96.226]) by mx.google.com with ESMTPSA id ci10sm480513lad.35.2015.04.21.08.44.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Apr 2015 08:44:04 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.84) (envelope-from ) id 1YkaKM-00074y-Qf; Tue, 21 Apr 2015 17:43:10 +0200 From: Johan Hovold To: Linus Walleij Cc: Alexandre Courbot , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 15/23] gpio: sysfs: only call irq helper if needed Date: Tue, 21 Apr 2015 17:42:23 +0200 Message-Id: <1429630951-27082-16-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.0.5 In-Reply-To: <1429630951-27082-1-git-send-email-johan@kernel.org> References: <1429630951-27082-1-git-send-email-johan@kernel.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Only call irq helper if actually reconfiguring interrupt state. This is a preparatory step in introducing separate gpio-irq request and free functions. Signed-off-by: Johan Hovold --- drivers/gpio/gpiolib-sysfs.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index 8041c1728231..bd22de806182 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c @@ -139,9 +139,6 @@ static int gpio_setup_irq(struct device *dev, unsigned long gpio_flags) unsigned long irq_flags; int ret, irq; - if ((desc->flags & GPIO_TRIGGER_MASK) == gpio_flags) - return 0; - irq = gpiod_to_irq(desc); if (irq < 0) return -EIO; @@ -225,6 +222,9 @@ static ssize_t edge_show(struct device *dev, static ssize_t edge_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t size) { + struct gpiod_data *data = dev_get_drvdata(dev); + struct gpio_desc *desc = data->desc; + unsigned long flags; ssize_t status; int i; @@ -234,12 +234,20 @@ static ssize_t edge_store(struct device *dev, return -EINVAL; found: + flags = trigger_types[i].flags; + mutex_lock(&sysfs_lock); - status = gpio_setup_irq(dev, trigger_types[i].flags); + if ((desc->flags & GPIO_TRIGGER_MASK) == flags) { + status = size; + goto out_unlock; + } + + status = gpio_setup_irq(dev, flags); if (!status) status = size; +out_unlock: mutex_unlock(&sysfs_lock); return status; @@ -675,7 +683,8 @@ void gpiod_unexport(struct gpio_desc *desc) * Release irq after deregistration to prevent race with * edge_store. */ - gpio_setup_irq(dev, 0); + if (desc->flags & GPIO_TRIGGER_MASK) + gpio_setup_irq(dev, 0); put_device(dev); kfree(data); }