From patchwork Tue Jun 1 16:21:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1486114 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4FvcqH4ShXz9sSn for ; Wed, 2 Jun 2021 02:21:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234050AbhFAQXM (ORCPT ); Tue, 1 Jun 2021 12:23:12 -0400 Received: from mga03.intel.com ([134.134.136.65]:31283 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234127AbhFAQXL (ORCPT ); Tue, 1 Jun 2021 12:23:11 -0400 IronPort-SDR: 0XLJNVcJMBo9wAsqMitQRV4TVoG9CYbjjUUCZ+qMjceeCvKSaX0AsLGTFsODmLILztIcHyeIBJ 2q/27bjhNJgg== X-IronPort-AV: E=McAfee;i="6200,9189,10002"; a="203614077" X-IronPort-AV: E=Sophos;i="5.83,240,1616482800"; d="scan'208";a="203614077" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2021 09:21:14 -0700 IronPort-SDR: 5i7QGMfN7LM23BdaW5FLA2mGTTRGNaJ2WNUxxX0en59aaHoBQDq2fAv7mNJD2WE1/TNtALOwX5 x6eZVkyYZtHQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,240,1616482800"; d="scan'208";a="399655545" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 01 Jun 2021 09:21:11 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 1C2A11FC; Tue, 1 Jun 2021 19:21:34 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Serge Semin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Hoan Tran , Serge Semin , Linus Walleij , Bartosz Golaszewski Subject: [PATCH v1 1/2] gpio: dwapb: Drop redundant check in dwapb_irq_set_type() Date: Tue, 1 Jun 2021 19:21:27 +0300 Message-Id: <20210601162128.35663-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org For more than 15 years we may not get into ->irq_set_type() without any meaningful type provided. Drop redundant check in dwapb_irq_set_type(). See the commit e76de9f8eb67 ("[PATCH] genirq: add SA_TRIGGER support") out of curiosity. Signed-off-by: Andy Shevchenko Acked-by: Serge Semin --- drivers/gpio/gpio-dwapb.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c index d3233cc4b76b..939701c1465e 100644 --- a/drivers/gpio/gpio-dwapb.c +++ b/drivers/gpio/gpio-dwapb.c @@ -297,9 +297,6 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type) irq_hw_number_t bit = irqd_to_hwirq(d); unsigned long level, polarity, flags; - if (type & ~IRQ_TYPE_SENSE_MASK) - return -EINVAL; - spin_lock_irqsave(&gc->bgpio_lock, flags); level = dwapb_read(gpio, GPIO_INTTYPE_LEVEL); polarity = dwapb_read(gpio, GPIO_INT_POLARITY); From patchwork Tue Jun 1 16:21:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1486113 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Fvcq12Kydz9sSn for ; Wed, 2 Jun 2021 02:21:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233904AbhFAQW5 (ORCPT ); Tue, 1 Jun 2021 12:22:57 -0400 Received: from mga17.intel.com ([192.55.52.151]:16173 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234021AbhFAQW5 (ORCPT ); Tue, 1 Jun 2021 12:22:57 -0400 IronPort-SDR: 1Crhr4A11propdC2FZgbjAg5DGww/nBjqBSkyf/nmhtNEg/3/YkTuLiY2zsvni+hTxN71MfhGQ 7eX3g0rMVmEA== X-IronPort-AV: E=McAfee;i="6200,9189,10002"; a="183941753" X-IronPort-AV: E=Sophos;i="5.83,240,1616482800"; d="scan'208";a="183941753" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2021 09:21:14 -0700 IronPort-SDR: inWOS2hhhCu2cW/feIREiAOO5utYQe3WzK78RD19zipr2n+kMFIAX16ytZp/GP6xls++SDtAFn 8fW1NeUEdZcg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,240,1616482800"; d="scan'208";a="479340729" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 01 Jun 2021 09:21:11 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2830EFD; Tue, 1 Jun 2021 19:21:34 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Serge Semin , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Hoan Tran , Serge Semin , Linus Walleij , Bartosz Golaszewski Subject: [PATCH v1 2/2] gpio: dwapb: Switch to use fwnode_irq_get() Date: Tue, 1 Jun 2021 19:21:28 +0300 Message-Id: <20210601162128.35663-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210601162128.35663-1-andriy.shevchenko@linux.intel.com> References: <20210601162128.35663-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org We have open coded variant of fwnode_irq_get() in dwapb_get_irq(). Replace it with a simple call. Signed-off-by: Andy Shevchenko Acked-by: Serge Semin Tested-by: Serge Semin --- drivers/gpio/gpio-dwapb.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c index 939701c1465e..7d61f5821e32 100644 --- a/drivers/gpio/gpio-dwapb.c +++ b/drivers/gpio/gpio-dwapb.c @@ -528,17 +528,13 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio, static void dwapb_get_irq(struct device *dev, struct fwnode_handle *fwnode, struct dwapb_port_property *pp) { - struct device_node *np = NULL; - int irq = -ENXIO, j; - - if (fwnode_property_read_bool(fwnode, "interrupt-controller")) - np = to_of_node(fwnode); + int irq, j; for (j = 0; j < pp->ngpio; j++) { - if (np) - irq = of_irq_get(np, j); - else if (has_acpi_companion(dev)) + if (has_acpi_companion(dev)) irq = platform_get_irq_optional(to_platform_device(dev), j); + else + irq = fwnode_irq_get(fwnode, j); if (irq > 0) pp->irq[j] = irq; }