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=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 40B1DC48BD9 for ; Thu, 27 Jun 2019 17:02:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1270F20659 for ; Thu, 27 Jun 2019 17:02:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="WtjLdKRZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726440AbfF0RCd (ORCPT ); Thu, 27 Jun 2019 13:02:33 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39317 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726405AbfF0RCd (ORCPT ); Thu, 27 Jun 2019 13:02:33 -0400 Received: by mail-wm1-f66.google.com with SMTP id z23so6390789wma.4 for ; Thu, 27 Jun 2019 10:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=W0xYG4HZED+E9m9ml553eZ53Gjg1VkuMzfTuMKX7NOM=; b=WtjLdKRZYuwoKitIobhj4K9KSYyPiUoXZW6ioFthuQbdp8UEve8t7GpRMp1aALF19q UZAtxDRbPNHz5prQJeL9Ul1rj9qOVqdUWM7RtjPlhZ2JGH6A9zvpOTNLXs1PIRe3VGIP bCUlWlVzVX/AxTrf051CWZym4qjjOoaOPKokncBlrLjsWdgkYw814Cml/b+nObvYYJIH gsIwBFvV77O0LqXrn7toHL9PLlYcz1Vid1KrDvfwBO0ZHLlkoru9V009klVEfTF/Jw9H TjDrBzSbaeo34P0CTE1l+RCD3FgxWjitnzCiRs5Ve5jqLkuP6y51gG+ciRnww2Kskwja uwqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=W0xYG4HZED+E9m9ml553eZ53Gjg1VkuMzfTuMKX7NOM=; b=k+W3yIedqMmKI3T/m6QH95YGhFlSD4D9xD0+TSrQR5HovWxOj5+SBheAfwmzHyR6oG 9GZILF9Xv+IlzUWItOScgpYmmoaTCiifJnNqYhr7KDr/F5fxpvjoyqK889BaSHUIGyiH rnj9baFH6HHjvSkTyOnYERWOT78l/nTCb7SrnBeFKOFgqZDI8dKHm6fBz+G9Yx87DbmB O/CR6/YCTqUi4qNKl53P+f8uVWE1+2jYsq/SVXzR9cfKNs0RnnRfT3XmoTdUvbkwQcx0 uNIqFhZFzEwJNexh27YGMKHlWr41D6elNCH6eJiQKx+vnEKd6Cjl/5PzLkRf4DQXr/sP KblQ== X-Gm-Message-State: APjAAAVtiklqrL78apLmndJ7sJz2cqgHHzi/f4H5ZhQbTLR/7LNQFdru tQRminol5SUk6m1mO0In6/1opbFiOldysw== X-Google-Smtp-Source: APXvYqyRPr35zAHEZhotfQo+gy8zClmyoxExMnjhDydqO+/Z/jhlRojaqqrjdkZQrf4UzOWJ2sbXZg== X-Received: by 2002:a1c:a783:: with SMTP id q125mr4124116wme.94.1561654950877; Thu, 27 Jun 2019 10:02:30 -0700 (PDT) Received: from genomnajs.guestnet.cambridge.arm.com ([212.187.182.165]) by smtp.gmail.com with ESMTPSA id l124sm9454503wmf.36.2019.06.27.10.02.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 27 Jun 2019 10:02:29 -0700 (PDT) From: Linus Walleij To: linux-gpio@vger.kernel.org Cc: Bartosz Golaszewski , Linus Walleij , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Thierry Reding Subject: [PATCH 3/5 v3] gpio: siox: Pass irqchip when adding gpiochip Date: Thu, 27 Jun 2019 18:02:21 +0100 Message-Id: <20190627170221.31444-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org We need to convert all old gpio irqchips to pass the irqchip setup along when adding the gpio_chip. For chained irqchips this is a pretty straight-forward conversion. Cc: Uwe Kleine-König Cc: Thierry Reding Signed-off-by: Linus Walleij --- ChangeLog v2->v3: - Diet down if (ret) { ... return ret; } return 0; to if (ret) ... return ret; ChangeLog v1->v2: - Split out bugfixes to separate patches. --- drivers/gpio/gpio-siox.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/gpio-siox.c b/drivers/gpio/gpio-siox.c index 40067e1535d3..26a0ecd487cb 100644 --- a/drivers/gpio/gpio-siox.c +++ b/drivers/gpio/gpio-siox.c @@ -211,6 +211,7 @@ static int gpio_siox_get_direction(struct gpio_chip *chip, unsigned int offset) static int gpio_siox_probe(struct siox_device *sdevice) { struct gpio_siox_ddata *ddata; + struct gpio_irq_chip *girq; int ret; ddata = devm_kzalloc(&sdevice->dev, sizeof(*ddata), GFP_KERNEL); @@ -239,18 +240,15 @@ static int gpio_siox_probe(struct siox_device *sdevice) ddata->ichip.irq_unmask = gpio_siox_irq_unmask; ddata->ichip.irq_set_type = gpio_siox_irq_set_type; - ret = gpiochip_add(&ddata->gchip); - if (ret) { - dev_err(&sdevice->dev, - "Failed to register gpio chip (%d)\n", ret); - return ret; - } + girq = &ddata->gchip.irq; + girq->chip = &ddata->ichip; + girq->default_type = IRQ_TYPE_NONE; + girq->handler = handle_level_irq; - ret = gpiochip_irqchip_add(&ddata->gchip, &ddata->ichip, - 0, handle_level_irq, IRQ_TYPE_NONE); + ret = gpiochip_add(&ddata->gchip); if (ret) dev_err(&sdevice->dev, - "Failed to register irq chip (%d)\n", ret); + "Failed to register gpio chip (%d)\n", ret); return ret; } -- 2.20.1