From patchwork Wed Aug 9 12:25:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 799761 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=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="FphAYQRd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xS9W54zpqz9s03 for ; Wed, 9 Aug 2017 22:26:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753026AbdHIM03 (ORCPT ); Wed, 9 Aug 2017 08:26:29 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:37892 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752741AbdHIMZO (ORCPT ); Wed, 9 Aug 2017 08:25:14 -0400 Received: by mail-wm0-f50.google.com with SMTP id m85so29756719wma.1 for ; Wed, 09 Aug 2017 05:25:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+T+LvFEjbhTtSrj3158XyEwsHNnphuVdUUp1UVqc/nI=; b=FphAYQRdlwCTk+gfhSrDQdfSBHulxxdJ5MSt3MEKubXHH2ThWByiDUGQX0fiR99DjD o7Q8freb4a+hKslrhXfP9fjvxnEz0JcZmDcoBFwLC3xG/DCKPNntxTSrx3WL9PA+aLHE NxS7kPhLZbJLPXFbZ2/ky8UX/Pvyc4Y9yXlMl4L+/BeOunzBG+jxMQdvT6O1Mw6phpib izQ5DkIxA0KWCHKJCVb/POZKqLUMR5+QTQcjS6txQXTecI+nkUzYm9w9S43WVwdtwqjn AFvRHwpI8hM1OLq2PREVZqlhpnhew2WETamIZMjM7Ugtyn0YikLPvG5yCeW0gyyj+MyU uKeA== 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:in-reply-to :references; bh=+T+LvFEjbhTtSrj3158XyEwsHNnphuVdUUp1UVqc/nI=; b=fWXGV9MXkfO48ojr6/sZw0DStdFWAK479zxlNb4vmtli4JHNsitpEvwek50dLoibN+ b+0rqCqdNLpQW3t9Xbmep+YwmVUqyFkNsSscRHtLtQYIkdOwQDnP258x7GcTD4xXbNej +OYZ/07yko2XlhCeHQBqgHxoPSJx3MBuvOxixZXwCS1AjzvZl5FTPaN8sL1JFz/TqpL8 vhaacs4X7pPPcUPRtpJJdQ9dH6QWMl5ITbsskOwdBzacOFVfGMxIVP6gcDdKKds5VF/o XKvxRpQ82AYct9BWayfa2mLDdG9lO/DHLzUMBqA99eYHUr7hrsRKy9/czkLKSkzaM2s7 8S+w== X-Gm-Message-State: AHYfb5gX/AfuVn/ueV5ecR84EXz9J8E8NN5S+++c+XUYnFrEUfL950Zf zcgWAUEFDWk5zbSJ X-Received: by 10.28.127.135 with SMTP id a129mr5056366wmd.91.1502281513574; Wed, 09 Aug 2017 05:25:13 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id p45sm5254729wrb.75.2017.08.09.05.25.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Aug 2017 05:25:13 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 4/8] gpio: sta2x11: use devres for irq generic chip Date: Wed, 9 Aug 2017 14:25:03 +0200 Message-Id: <20170809122507.11149-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170809122507.11149-1-brgl@bgdev.pl> References: <20170809122507.11149-1-brgl@bgdev.pl> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Use resource managed variants of irq_alloc_generic_chip() and irq_setup_generic_chip(). Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-sta2x11.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c index 56beb31c03db..407359da08f9 100644 --- a/drivers/gpio/gpio-sta2x11.c +++ b/drivers/gpio/gpio-sta2x11.c @@ -324,9 +324,11 @@ static int gsta_alloc_irq_chip(struct gsta_gpio *chip) { struct irq_chip_generic *gc; struct irq_chip_type *ct; + int rv; - gc = irq_alloc_generic_chip(KBUILD_MODNAME, 1, chip->irq_base, - chip->reg_base, handle_simple_irq); + gc = devm_irq_alloc_generic_chip(chip->dev, KBUILD_MODNAME, 1, + chip->irq_base, + chip->reg_base, handle_simple_irq); if (!gc) return -ENOMEM; @@ -338,8 +340,11 @@ static int gsta_alloc_irq_chip(struct gsta_gpio *chip) ct->chip.irq_enable = gsta_irq_enable; /* FIXME: this makes at most 32 interrupts. Request 0 by now */ - irq_setup_generic_chip(gc, 0 /* IRQ_MSK(GSTA_GPIO_PER_BLOCK) */, 0, - IRQ_NOREQUEST | IRQ_NOPROBE, 0); + rv = devm_irq_setup_generic_chip(chip->dev, gc, + 0 /* IRQ_MSK(GSTA_GPIO_PER_BLOCK) */, + 0, IRQ_NOREQUEST | IRQ_NOPROBE, 0); + if (rv) + return rv; /* Set up all all 128 interrupts: code from setup_generic_chip */ {