From patchwork Mon Nov 13 13:36:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 118742 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1803105qgn; Mon, 13 Nov 2017 05:37:02 -0800 (PST) X-Google-Smtp-Source: AGs4zMZzA+92NWmVA0DCnoYTgFQnvgN+wJorJxYBW5QQcPbBBGxi9pVivd4+w4hR0zCCiyHuEc7R X-Received: by 10.99.50.135 with SMTP id y129mr8520085pgy.399.1510580222290; Mon, 13 Nov 2017 05:37:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510580222; cv=none; d=google.com; s=arc-20160816; b=kgppMjfAjKmCVrzbmrcif1EZCUDe/9FIGTEbQVmPNOGsM9Bp8+tKOu3STxIhjGFkGz EIFh4xrxKcc5BSyENz8VoRQAy4o/2ttQx8yRIE0a3Ym+KFcX8xRt1cwZBSiRYjNxSBgs Lx0G0gfjE723oXOZBE5mTTsMvqwW7kkGY843Qz7kkw/fsLFaPFEgLDU5JVaoc5EYACcv 7NxEB7nejknFktwXQUpj45qRMpl8/Usr5NqIdBU657a+4yMs9mnvEVCHM8k1SKr8x+LP XGgjz+X+NscqpbezPaxCs/bZbe0/zdKtN21NUS4vJgWZmLqdiWrW/gZKLGRvCI7tz8rd duyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=4Lq6gKTtYa1mVNVJcaM1HkBxcjyQV3Oxp1Es4LbAiqk=; b=DD5g/RE3uNb2Te7ZLdkwYYouOiSS6OHiT/GmZT8gNvkqjGlZ9Y+7lZGTRKBTy+miGb HUuwNvezE/JNWJz3xO6ULJBCsQIMsK1nJNSmv8+FZXtU7XJUEUNt8Ky0FTkxfOPcBPnb /HRINygH0M7oYEbHNB9KIfPLnAoDDk+yzS9021aeRZKGqHnJg2iAwhw+wVXcwPPRFdtv 95tA//5wPiPmg5UltNBajjGyzJdEGbFdAizAqA+7pReCcBpWm1lDVVz0u0pMKjh3ma7Q i6uq+G1zYsG2jWKRGJLLM3OtjOecGHpgr1hOUQdMqe1RqtMJ+5/5GoFjpmITDC3Y8np8 b0XA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=m6NU3t9A; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u196si14117751pgc.388.2017.11.13.05.37.02; Mon, 13 Nov 2017 05:37:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=m6NU3t9A; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753639AbdKMNg6 (ORCPT + 6 others); Mon, 13 Nov 2017 08:36:58 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:36183 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752820AbdKMNg4 (ORCPT ); Mon, 13 Nov 2017 08:36:56 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-10.nifty.com with ESMTP id vADDaP99020050; Mon, 13 Nov 2017 22:36:25 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com vADDaP99020050 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1510580185; bh=mRXtXKcQTeUwMIVMM6FlFY4InfS2Is7CFksxy8y0Ohg=; h=From:To:Cc:Subject:Date:From; b=m6NU3t9AvjvBgEoKUwLNF+J2OhMvFYlz3DTacOP3ttauOyq61mBPAAO5QvZ9+Ng98 zFmwtNNScJ5hG7+cZeSgwiN9hVfyjriQUVX42tSFqmkVICpgEQiCPR12MezOGUcuo6 Mh21OU+e6nAWJrwtR7F57nnQ8uLDLBaW3Xg5TKfeUxv7U1qhSBKNN1AbOls2b7kUb9 pgg+yQdiwo+Ka1N6ij0jdGbdLPfuy2+cUYDFyW/0mkYe1EjntcYz5F037xspYl+QBY wPM0zcintdVGnix5lJwJRpnk+QiJTLiFj3c6rOASBJx5R2siIZZcJB4aYe+FIqiflK Xg8XLVCTjZ0jA== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-gpio@vger.kernel.org Cc: Stephen Rothwell , Linus Walleij Subject: [PATCH] gpio: uniphier: merge fix for "Update irq_domain_ops.activate() signature" Date: Mon, 13 Nov 2017 22:36:16 +0900 Message-Id: <1510580176-7483-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Stephen Rothwell Signed-off-by: Stephen Rothwell --- Changes since Stephens's original post - Fix checkpatch.pl warning "CHECK: Alignment should match open parenthesis" - Stretch lines since it fits in 80-columns drivers/gpio/gpio-uniphier.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c index d62cea4..71b768e 100644 --- a/drivers/gpio/gpio-uniphier.c +++ b/drivers/gpio/gpio-uniphier.c @@ -300,13 +300,15 @@ static int uniphier_gpio_irq_domain_alloc(struct irq_domain *domain, return irq_domain_alloc_irqs_parent(domain, virq, 1, &parent_fwspec); } -static void uniphier_gpio_irq_domain_activate(struct irq_domain *domain, - struct irq_data *data) +static int uniphier_gpio_irq_domain_activate(struct irq_domain *domain, + struct irq_data *data, bool early) { struct uniphier_gpio_priv *priv = domain->host_data; struct gpio_chip *chip = &priv->chip; gpiochip_lock_as_irq(chip, data->hwirq + UNIPHIER_GPIO_IRQ_OFFSET); + + return 0; } static void uniphier_gpio_irq_domain_deactivate(struct irq_domain *domain,