From patchwork Mon May 4 15:10:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 467669 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 ADA19140157 for ; Tue, 5 May 2015 01:19:22 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=xh0XP8bJ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751990AbbEDPSA (ORCPT ); Mon, 4 May 2015 11:18:00 -0400 Received: from mail-lb0-f177.google.com ([209.85.217.177]:34322 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752051AbbEDPNp (ORCPT ); Mon, 4 May 2015 11:13:45 -0400 Received: by lbcga7 with SMTP id ga7so107204699lbc.1; Mon, 04 May 2015 08:13:44 -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=Kl+a+jJMAP7kbtQYPmL+cGN0SQXl7X4WQRrzaWWu/r0=; b=xh0XP8bJ55BecIU0i9wqTlDe3IrYlFTgURPcT0DGRwwPJcUSZGj0obNppNuwVHlKiQ nWBiJZr86d8HiMlyIEf0d1NTMKlPe+KkznkjCXESWQV7ZdOKFV9V+ayh6gxf7SIQzZfo zhYkn0Xx9q+I+6y4ojApelWDA3aaOBtTjB8BLNcLWrybjDhYTMm3Ho2RZS0a8WUtVf13 czdzLXcqNb7ueEy6lw2Mkv2HkFPwJfNaDUmWgLnc6OrdDcqZkekXohPeqKZlTDFQp46+ YaatSDzCk5thUTUBLAxA9hPGQLL5aO6Xp42Tl9CtX9JaSuBPuBHTUGdg9OT7LdXaPkMZ Gngw== X-Received: by 10.152.88.46 with SMTP id bd14mr19737217lab.71.1430752424055; Mon, 04 May 2015 08:13:44 -0700 (PDT) Received: from xi.terra (c193-14-96-226.cust.tele2.se. [193.14.96.226]) by mx.google.com with ESMTPSA id fb5sm3407769lbc.35.2015.05.04.08.13.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 May 2015 08:13:41 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.84) (envelope-from ) id 1YpI3z-00042s-5e; Mon, 04 May 2015 17:13:43 +0200 From: Johan Hovold To: Linus Walleij Cc: Alexandre Courbot , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 15/23] gpio: sysfs: only call irq helper if needed Date: Mon, 4 May 2015 17:10:40 +0200 Message-Id: <1430752248-15401-16-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.0.5 In-Reply-To: <1430752248-15401-1-git-send-email-johan@kernel.org> References: <1430752248-15401-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 bccba406fc22..201b757ad0db 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; @@ -240,6 +237,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; @@ -249,12 +249,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; @@ -690,7 +698,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); }