From patchwork Fri Nov 18 12:25:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 22304 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp165827wrr; Fri, 18 Nov 2022 04:28:18 -0800 (PST) X-Google-Smtp-Source: AA0mqf5HnTF3ymcjkUkU39H3Aqfvp+X6FPbi7yV6K49VV/Z6hTX8EPdeSPD7YSvqH6uUfee/QN/Y X-Received: by 2002:a62:5f46:0:b0:56b:cc74:4bd5 with SMTP id t67-20020a625f46000000b0056bcc744bd5mr7673012pfb.79.1668774498282; Fri, 18 Nov 2022 04:28:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668774498; cv=none; d=google.com; s=arc-20160816; b=g4kT/09wB/GDzY9SRHk5uiBD+r2NxzaiO+vEgLdAQqDNLsDu890wjXzQihxhxj29Z/ j04fB5P2QilptoBIrTS5C0q9+5DEVKWUxqm/Hvm2A9NY1w3asHIOCmGYXTFDY5xpcJ/0 ++R6IruYW/QW71mkobZKtSvznwkBp1jGx0xFwpRGCFJa+Nd7XOV7oTs0M1BrxW1GPtym qcI894NRiTsnWxTrYosDRmB7UhpMToIOTUPH5L9Efs9pRxYlLOoW/YlFEGIVj1bGj7ZA pYaFIthoFEUNAxEMYePyiE6xbQPNK7iyT5FHE+uWXSBs5WH6BlrUezLKtRUb3UCJevFT Wu3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=j23hZnphv0jcgZfiOY9qWXNDpMCFFj9PRM3bEUKGmc4=; b=lcTGkZi/hIZqilnvW114+9B/8IQF3FSXsc7MbYvAakQyV1fZwcXDbflwA77O4Eai9i Uk4y2a4MDKpf91nctIsXe2USmf6avJdDTBKAznbPbereYzT+JGpW2GSVHBKVGNNSoFWN ZfrOUPmj70oQfouwIkhLgKRs/t8uU9RAYyTzW/CoKvw2pct5P91o4MTmkT5q8hhh4NmL 5SfBVjNsWc8WVUtxCrvUxzs9STD4oSE4IqV0gBCtp/sZtoRgMOs/xPolGq69yKRuCgR1 /MiPqRRO73orD/FfohXBkAn8KmESED5qBs8cVEe1CPEmFUkDl+1VLNJt7wcYTXUX+zSx Duyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20210112.gappssmtp.com header.s=20210112 header.b=XgxLUl8p; 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 u18-20020a17090341d200b0016ce3d67e7csi3990959ple.387.2022.11.18.04.28.04; Fri, 18 Nov 2022 04:28:18 -0800 (PST) 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=pass header.i=@bgdev-pl.20210112.gappssmtp.com header.s=20210112 header.b=XgxLUl8p; 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 S241579AbiKRM1X (ORCPT + 99 others); Fri, 18 Nov 2022 07:27:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241837AbiKRM0a (ORCPT ); Fri, 18 Nov 2022 07:26:30 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28A2699EAA for ; Fri, 18 Nov 2022 04:26:15 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id l39-20020a05600c1d2700b003cf93c8156dso3910921wms.4 for ; Fri, 18 Nov 2022 04:26:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j23hZnphv0jcgZfiOY9qWXNDpMCFFj9PRM3bEUKGmc4=; b=XgxLUl8pt1XNL0iLDiU427YWuA+WEaiaCkEvGhMxKvHS7AzO0WGlJgFy/efbY2ozcc DOQb1IEBoBtO3VW7x+t4MJQYkrfiPsUkhRvFkGp9UAoID4XLDZR8DnoIwBtbmXRAHpOc 1oAXfiRsZyf4XuQMoOBnck65CaxmocuvADWKoZ3v+xS5uJMkpxOVxStEib7omyU7FG7X C0XU2f6TZgVvuoiBIgwqpOGHZ+qbVlVWTpDgUyO2oTqQxS4y7gMJWOMZmlX9oupLSzvj V5IED7b3gL8JPqwwin/Vx0dh/ewtVRM8QWnjapPvxRs6gVqFpNBCjdSiH9oBrQFTwi9T vmSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j23hZnphv0jcgZfiOY9qWXNDpMCFFj9PRM3bEUKGmc4=; b=4qplg9rJMtWKnDzAU5lm7H+599lVqr99qr6SBi1BnWv06XKzB9Obel86ZndOab6gQ7 PoyITMywi6cGJAtkOCXqy7rbYMfaw3Kfr6FXEERnwekr13G/GZmhEhSXXFb6lqiQCuTH oG3wR8o/R5qgN1DL+nju0jOHaAbkdi+yF+eVHrAWdpLeq5YEh3/c+pnHnNXEQffeR/cu ov8LnHWBdc3gMwSbae+QhPbe/ciHr3+Bl99Xxv4ICgGB/3Yxf5G/oUBxkP3RoMrwHVD6 ZsRTQqxZriL/HdwaW+5RqOcuLbpwgIG81dHfEJXp/teLg7nOFpvo0Jhwk8T2LhGSFFws wNiQ== X-Gm-Message-State: ANoB5plgx1DsiWz+NFT6QKvr73HKosWVIcpkBJ0zOQAAw0pzJZaflVhj UvTxLvhJx+/NZNkKYNT+bhO+SQ== X-Received: by 2002:a05:600c:19d0:b0:3cf:e7b7:d87d with SMTP id u16-20020a05600c19d000b003cfe7b7d87dmr7852582wmq.95.1668774373630; Fri, 18 Nov 2022 04:26:13 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:b10c:1279:a704:75d4]) by smtp.gmail.com with ESMTPSA id f19-20020a05600c155300b003c6f3e5ba42sm9873958wmg.46.2022.11.18.04.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Nov 2022 04:26:13 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 12/15] tty: serial: provide devm_uart_add_one_port() Date: Fri, 18 Nov 2022 13:25:36 +0100 Message-Id: <20221118122539.384993-13-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221118122539.384993-1-brgl@bgdev.pl> References: <20221118122539.384993-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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?1749836888247515323?= X-GMAIL-MSGID: =?utf-8?q?1749836888247515323?= From: Bartosz Golaszewski Provide a devres variant of uart_add_one_port() that removes the managed port at device detach. Signed-off-by: Bartosz Golaszewski --- .../driver-api/driver-model/devres.rst | 3 ++ drivers/tty/serial/serial_core.c | 36 +++++++++++++++++++ include/linux/serial_core.h | 6 ++++ 3 files changed, 45 insertions(+) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index 56082265e8e5..5d07a8c1eadb 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -436,6 +436,9 @@ RTC SERDEV devm_serdev_device_open() +SERIAL + devm_uart_add_one_port() + SLAVE DMA ENGINE devm_acpi_dma_controller_register() diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 179ee199df34..005190b279b3 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3217,6 +3217,42 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport) } EXPORT_SYMBOL(uart_remove_one_port); +struct uart_port_devres { + struct uart_driver *drv; + struct uart_port *port; +}; + +static void devm_uart_remove_one_port(struct device *dev, void *data) +{ + struct uart_port_devres *res = data; + + uart_remove_one_port(res->drv, res->port); +} + +int devm_uart_add_one_port(struct device *dev, + struct uart_driver *drv, struct uart_port *port) +{ + struct uart_port_devres *res; + int ret; + + res = devres_alloc(devm_uart_remove_one_port, sizeof(*res), GFP_KERNEL); + if (!res) + return -1; + + ret = uart_add_one_port(drv, port); + if (ret) { + devres_free(res); + return -1; + } + + res->drv = drv; + res->port = port; + devres_add(dev, res); + + return 0; +} +EXPORT_SYMBOL(devm_uart_add_one_port); + /** * uart_match_port - are the two ports equivalent? * @port1: first port diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index d657f2a42a7b..d0911f04706e 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -771,6 +771,12 @@ int uart_remove_one_port(struct uart_driver *reg, struct uart_port *port); bool uart_match_port(const struct uart_port *port1, const struct uart_port *port2); +/* + * UART devres + */ +int devm_uart_add_one_port(struct device *dev, + struct uart_driver *drv, struct uart_port *port); + /* * Power Management */