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: 837435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="m6NU3t9A"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ybBWf54Tfz9sPr for ; Tue, 14 Nov 2017 00:37:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753639AbdKMNg6 (ORCPT ); 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(-) 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,