From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4609C282D7 for ; Wed, 30 Jan 2019 16:30:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 753D12087F for ; Wed, 30 Jan 2019 16:30:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=vdorst.com header.i=@vdorst.com header.b="Q9XXtAbB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731968AbfA3QaW (ORCPT ); Wed, 30 Jan 2019 11:30:22 -0500 Received: from mail.0dd.nl ([5.2.79.48]:50318 "EHLO mail.0dd.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731837AbfA3QaV (ORCPT ); Wed, 30 Jan 2019 11:30:21 -0500 X-Greylist: delayed 548 seconds by postgrey-1.27 at vger.kernel.org; Wed, 30 Jan 2019 11:30:19 EST Received: from mail.vdorst.com (mail.vdorst.com [IPv6:fd01::250]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.0dd.nl (Postfix) with ESMTPS id 1359D5FBBA; Wed, 30 Jan 2019 17:21:10 +0100 (CET) Received: from pc-rene.vdorst.com (unknown [IPv6:2a02:a453:deab:1:da50:e6ff:fed1:4a04]) by mail.vdorst.com (Postfix) with ESMTPA id BB08B144E22E; Wed, 30 Jan 2019 17:21:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.vdorst.com BB08B144E22E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vdorst.com; s=default; t=1548865269; bh=2xP4S+Wm3gHYdSo0LmOa8YFuGyOM5h7SS9B1JEhJuPs=; h=From:To:Cc:Subject:Date:From; b=Q9XXtAbB/GuH/mcXgHlkFZkQYfAC/kV8AwdVFW1wlCPcfZp2ACZGsEIE31W9l4G1V HLnGxN5D+CdyhVexSzX1tnc1+p500vdUSAS0CobKYIma6VXSq4ZkDzXlEmyKa5eopu 5JhUQIbqbqQUFQmqUmXhWWkom6okQ4ZnBkL0lMg7mQubhHLzHozBGBUdlNkzrMIB8R d5wH5Kmbl2VAPsh609VF7cVJpnQNbWGjtD4c9gCyLVqrsWHYSd+ue9/lkapUEfCWu3 6IXezV/pyanCUG+9mSoX+JjHlVhjFn/YF6Psw2ZrPnXDKI8NMpkumYxExeF0krlsch StI4UsEf55mpA== From: =?UTF-8?q?Ren=C3=A9=20van=20Dorst?= To: Linus Walleij , Bartosz Golaszewski , Matthias Brugger Cc: =?UTF-8?q?Ren=C3=A9=20van=20Dorst?= , linux-gpio@vger.kernel.org, linux-mediatek@lists.infradead.org, gerg@kernel.org, stable@vger.kernel.org Subject: [PATCHv2] gpio: MT7621: use a per instance irq_chip structure Date: Wed, 30 Jan 2019 17:10:49 +0100 Message-Id: <20190130161048.9852-1-opensource@vdorst.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This fixes the kernel complains: gpio gpiochip1: (1e000600.gpio-bank1): detected irqchip that is shared with multiple gpiochips: please fix the driver. gpio gpiochip2: (1e000600.gpio-bank2): detected irqchip that is shared with multiple gpiochips: please fix the driver. Fixes: 4ba9c3afda41 ("gpio: mt7621: Add a driver for MT7621") Signed-off-by: René van Dorst Cc: linux-gpio@vger.kernel.org Cc: linux-mediatek@lists.infradead.org Cc: gerg@kernel.org Cc: stable@vger.kernel.org --- drivers/gpio/gpio-mt7621.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) v2: Remove an empty line Add Cc stable diff --git a/drivers/gpio/gpio-mt7621.c b/drivers/gpio/gpio-mt7621.c index 00e954f22bc9..74401e0adb29 100644 --- a/drivers/gpio/gpio-mt7621.c +++ b/drivers/gpio/gpio-mt7621.c @@ -30,6 +30,7 @@ #define GPIO_REG_EDGE 0xA0 struct mtk_gc { + struct irq_chip irq_chip; struct gpio_chip chip; spinlock_t lock; int bank; @@ -189,13 +190,6 @@ mediatek_gpio_irq_type(struct irq_data *d, unsigned int type) return 0; } -static struct irq_chip mediatek_gpio_irq_chip = { - .irq_unmask = mediatek_gpio_irq_unmask, - .irq_mask = mediatek_gpio_irq_mask, - .irq_mask_ack = mediatek_gpio_irq_mask, - .irq_set_type = mediatek_gpio_irq_type, -}; - static int mediatek_gpio_xlate(struct gpio_chip *chip, const struct of_phandle_args *spec, u32 *flags) @@ -254,6 +248,13 @@ mediatek_gpio_bank_probe(struct device *dev, return ret; } + rg->irq_chip.name = dev_name(dev); + rg->irq_chip.parent_device = dev; + rg->irq_chip.irq_unmask = mediatek_gpio_irq_unmask; + rg->irq_chip.irq_mask = mediatek_gpio_irq_mask; + rg->irq_chip.irq_mask_ack = mediatek_gpio_irq_mask; + rg->irq_chip.irq_set_type = mediatek_gpio_irq_type; + if (mtk->gpio_irq) { /* * Manually request the irq here instead of passing @@ -270,14 +271,14 @@ mediatek_gpio_bank_probe(struct device *dev, return ret; } - ret = gpiochip_irqchip_add(&rg->chip, &mediatek_gpio_irq_chip, + ret = gpiochip_irqchip_add(&rg->chip, &rg->irq_chip, 0, handle_simple_irq, IRQ_TYPE_NONE); if (ret) { dev_err(dev, "failed to add gpiochip_irqchip\n"); return ret; } - gpiochip_set_chained_irqchip(&rg->chip, &mediatek_gpio_irq_chip, + gpiochip_set_chained_irqchip(&rg->chip, &rg->irq_chip, mtk->gpio_irq, NULL); } @@ -310,7 +311,6 @@ mediatek_gpio_probe(struct platform_device *pdev) mtk->gpio_irq = irq_of_parse_and_map(np, 0); mtk->dev = dev; platform_set_drvdata(pdev, mtk); - mediatek_gpio_irq_chip.name = dev_name(dev); for (i = 0; i < MTK_BANK_CNT; i++) { ret = mediatek_gpio_bank_probe(dev, np, i); -- 2.19.1