From patchwork Mon May 29 14:07:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 100308 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1556424vqr; Mon, 29 May 2023 07:30:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5EdrGQKcvIH36OZgKgCzd7/Xr3R0TceWr6K1m2U1YGO81n882jECIzEsyTqCnaXjIuJIOk X-Received: by 2002:a05:6a00:1a8e:b0:64b:f03b:2642 with SMTP id e14-20020a056a001a8e00b0064bf03b2642mr14100542pfv.23.1685370600755; Mon, 29 May 2023 07:30:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685370600; cv=none; d=google.com; s=arc-20160816; b=wMMAVf3Y8iHED43n0nGh5aQlFhMfmk4BPFFqVt3Gk2fCFg5iCLZc/hta0t+1OTxcmh KwPJodYx6dTOpgj8zqHA61JjdYrn1MQWSmseonDgE2LH7HrBQd39sUWehaftO/ogf4jd OgxIHqDFUvUNT26paviKr9jDiaWl3mh2mfvN3opKrv+PrfVqPo+tWXoqhqo6fXqgqvmA Cng3TpZjEdTTIBneTc10X+4650Y39PxjQz7stRXBryRUF2PlPcECGlicQ1YZCqh2M7I8 6wESbOlGDy7+UG7FqOdogqVNrGp5xXG6b+9fAXL4LZ7AU90XAVu9wgCDvYJGAsGdU8um +QEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=fnoPVvoDbKnCVpqeYuYhmBuue3U9tzCbLMDvkdsYgMQ=; b=Hjf2ekPuM4+JG2LyGqXjHo5aYnnADszpC3DtcAJWksR+Rd7+7Kt/jKCY1hrDqfAOIf +NQweugEa3HnUtH2rgaEjtSQhqM6XpD24Yf9a+sT8rRmE11iYVLbxfMknX20tdjrTg8k gWhk+DpubXetbKl3Zq/RafuHlfaLvOCg8tiOZ7lZAz4wJccpFz+nIBR/pGvAolRj9ju+ KUDTPVHi1/MZAA95oOFvAUbNlti5myknSAuCBjoUJX5bjBWFq3w9wmZhBg723fS9xK9u yTe6nwcegfiGUGppoD6SCbaUTLv5GHAydVlDvq70DD1MfOJdZqM2eXcGBYDbxwKZWQsB JDUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=FzPd29W+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a18-20020a637f12000000b0053f0d8ac4b0si9226419pgd.825.2023.05.29.07.29.46; Mon, 29 May 2023 07:30:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=FzPd29W+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230292AbjE2OIC (ORCPT + 99 others); Mon, 29 May 2023 10:08:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230293AbjE2OHg (ORCPT ); Mon, 29 May 2023 10:07:36 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 479B09C; Mon, 29 May 2023 07:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=fnoPVvoDbKnCVpqeYuYhmBuue3U9tzCbLMDvkdsYgMQ=; b=FzPd29W+ywwYVBGyiO7mWWQy6b 35Aiu8D2x6oD1ZE0zZm8Vl2X+yYmjMOAcsteugL71v94nwDkFIQf86LyHelRPgwUGoIr5qnQ26vH9 +WGN+4Q1kMogtpqOmQUeP8WOb3X7uVq8Tb8Ob3XDlL+HcELGWwp+Wx9MJPHA86Ll2kG8=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:50024 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q3dWw-0004Ht-KH; Mon, 29 May 2023 10:07:28 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jirislaby@kernel.org, jringle@gridpoint.com, l.perczak@camlintechnologies.com, tomasz.mon@camlingroup.com Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, linux-gpio@vger.kernel.org, Hugo Villeneuve Date: Mon, 29 May 2023 10:07:07 -0400 Message-Id: <20230529140711.896830-6-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230529140711.896830-1-hugo@hugovil.com> References: <20230529140711.896830-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 70.80.174.168 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v4 5/9] serial: sc16is7xx: refactor GPIO controller registration X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767239163185232227?= X-GMAIL-MSGID: =?utf-8?q?1767239163185232227?= From: Hugo Villeneuve In preparation for patch to fix GPIO regression. To facilitate review and make code more modular. Signed-off-by: Hugo Villeneuve --- drivers/tty/serial/sc16is7xx.c | 39 ++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 06be1daa733a..7a993add3f04 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1358,6 +1358,26 @@ static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip, return 0; } + +static int sc16is7xx_setup_gpio_chip(struct device *dev) +{ + struct sc16is7xx_port *s = dev_get_drvdata(dev); + + if (!s->devtype->nr_gpio) + return 0; + + s->gpio.owner = THIS_MODULE; + s->gpio.parent = dev; + s->gpio.label = dev_name(dev); + s->gpio.direction_input = sc16is7xx_gpio_direction_input; + s->gpio.get = sc16is7xx_gpio_get; + s->gpio.direction_output = sc16is7xx_gpio_direction_output; + s->gpio.set = sc16is7xx_gpio_set; + s->gpio.base = -1; + s->gpio.ngpio = s->devtype->nr_gpio; + s->gpio.can_sleep = 1; + return gpiochip_add_data(&s->gpio, s); +} #endif static const struct serial_rs485 sc16is7xx_rs485_supported = { @@ -1517,22 +1537,9 @@ static int sc16is7xx_probe(struct device *dev, } #ifdef CONFIG_GPIOLIB - if (devtype->nr_gpio) { - /* Setup GPIO cotroller */ - s->gpio.owner = THIS_MODULE; - s->gpio.parent = dev; - s->gpio.label = dev_name(dev); - s->gpio.direction_input = sc16is7xx_gpio_direction_input; - s->gpio.get = sc16is7xx_gpio_get; - s->gpio.direction_output = sc16is7xx_gpio_direction_output; - s->gpio.set = sc16is7xx_gpio_set; - s->gpio.base = -1; - s->gpio.ngpio = devtype->nr_gpio; - s->gpio.can_sleep = 1; - ret = gpiochip_add_data(&s->gpio, s); - if (ret) - goto out_thread; - } + ret = sc16is7xx_setup_gpio_chip(dev, mctrl_mask); + if (ret) + goto out_thread; #endif /*