From patchwork Fri Jun 2 15:26:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 102612 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1115083vqr; Fri, 2 Jun 2023 08:34:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5UAb+NOWhCJRACi7OGZUjQV4LAFNcUQCvNEeAEpbOQd6pfskE23Z5pZmFncPd0ILB6OKLS X-Received: by 2002:a17:903:2343:b0:1b1:c0f7:cd27 with SMTP id c3-20020a170903234300b001b1c0f7cd27mr168829plh.22.1685720087763; Fri, 02 Jun 2023 08:34:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685720087; cv=none; d=google.com; s=arc-20160816; b=NuHJxn/RW9YILZFTdyEdI3YdlS8bqxAmWRM8wTjHupYvsmbmzI+CPMqkTufkpsC2VS L9LgeM5B8l1E948q6nbzTjGCeW+CYkGy7X4uat9q6moJJEQauTOmpaeo19uAgfcE13Q7 4a8mepwcdeT53ifJAFsF14QvL92lmPaspKP2rA4cM5rDXbtlyJiE8hZCjStWQHCnPiPY +2Pyfgyu9BZhQDSrfb7xHOhN/r9jJTEve5U5aAe2Se6oQyXrneo62d4XaDwVFSDyEYLe husoYMK3v2GIRaGnVYbmX/qhbcnbUG5y+R6wTHthUQvtu1LT9VJbx6ewIg8JDpNjJ8kW OJkw== 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=PvKU1KZMqnBynFfs1LyL8913fUHPvhHtVoFLTU7Udeg=; b=Jddq6qJ5lkQkE2mm+UdFkB0cbIICItlrbwPDkw+beLo3kurVS6mglUorlw88CeaSee X+dUi7SvAuyg+TMcws2m7V965jV6aDLRGeYQQL/MvMW7iD+S0l+eSEnIxzJ7+4gcWsjP HCrT6UBr0Adt8mFlb90F6UTgAUmZ3AsA4nlpHtZLOJ5CSMv8E/IRTh9M9fsUMu437kBf xNOh3dpEYf10Dw0Z5SQnyEs6FooQyvms5POi9yqkumLlQaQzefUjiaT40f/Ea04Jq1Kq j9qD9Wy39XU84BHgkk6VuGPtqYqUe1eMfamVRKtR5w9N5aPt8p8P9fn08dfTKLIWNcVh EbCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=BV5gsTU3; 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 q2-20020a170902edc200b001ab1fb8cc83si1036683plk.161.2023.06.02.08.34.34; Fri, 02 Jun 2023 08:34:47 -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=BV5gsTU3; 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 S236665AbjFBP0v (ORCPT + 99 others); Fri, 2 Jun 2023 11:26:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236530AbjFBP0n (ORCPT ); Fri, 2 Jun 2023 11:26:43 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43CE7E41; Fri, 2 Jun 2023 08:26:39 -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=PvKU1KZMqnBynFfs1LyL8913fUHPvhHtVoFLTU7Udeg=; b=BV5gsTU3lZM+pr49QxIjGrjiOO JY7GPXSkxNy+S0wKWIGlnPvOzFAp27U1752vlfGTOjPU33N/QAnXnOr2lu3ETtKjdA+JAFwUpA7X9 UUCOVxzTpkPnR7VB8Lc8UrV9yMjnvZqILDrqzLFCPu/P03PVlUSZn6gAKVd++0mgLXWw=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:50948 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q56fh-0008Hq-RU; Fri, 02 Jun 2023 11:26:34 -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, tomasz.mon@camlingroup.com, l.perczak@camlintechnologies.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 , stable@vger.kernel.org, Lech Perczak Date: Fri, 2 Jun 2023 11:26:19 -0400 Message-Id: <20230602152626.284324-4-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230602152626.284324-1-hugo@hugovil.com> References: <20230602152626.284324-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,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v7 3/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?1767605626613190448?= X-GMAIL-MSGID: =?utf-8?q?1767605626613190448?= From: Hugo Villeneuve In preparation for upcoming patch "fix regression with GPIO configuration". To facilitate review and make code more modular. Cc: # 6.1.x Signed-off-by: Hugo Villeneuve Reviewed-by: Lech Perczak Tested-by: Lech Perczak --- 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 0c903d44429c..7d50674d2d0e 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1349,6 +1349,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 = { @@ -1502,22 +1522,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); + if (ret) + goto out_thread; #endif /*