From patchwork Fri Nov 18 12:25:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 22310 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp166112wrr; Fri, 18 Nov 2022 04:29:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf6D0l5GAoW3TjYSaJDoQ1uXQOP4nYMSR4rBbK9qPtKMTC3Q7bfXxMIB+sEFhbnVlAUV3pWa X-Received: by 2002:a17:90a:d581:b0:212:b43b:ffe5 with SMTP id v1-20020a17090ad58100b00212b43bffe5mr7735473pju.32.1668774540435; Fri, 18 Nov 2022 04:29:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668774540; cv=none; d=google.com; s=arc-20160816; b=PPubpk6GtWXGai9FZ65ToUpA3rm/oF8lLipm2iUWZ8YmjFm3oU/KkiQMYMQi00gOSQ lTgngx5BUBdu1Yx8336x15En5TF4DBdviPNRQtn+CkPLoFn94pNRtMIQOJ5uRspXxd1y 4TZfTPTrE54On+N2RJxFXSxGO7kPn8tqG8mocp1tThFyH4Imd9LP6RPjVBksmVIsHrtv tc3w/MfDCB4sy2YazyHNh+QVyGdYLQXvaCdkKmyS+1jW/JYUoBBdZa6aaNTiL6jZ7YiM VoFHU3KcRJYgxCSyrzl8IEShGJT9dIoj5+cKvcLWXZQ9rJgTSeCwxbDjco6McbCCl5dW pZmA== 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=Ko+jjIDfILZRTvWmBV6W3WbxjLYlDDq9YeO4lkVcz7M=; b=VJWTNFhy3VgMb9cEH80B+LdjJ2s38A0fX6RUhL4Vat/5nlJBbfZKZoWbXoBncBfhkQ QEuNJVfdSIzHNqhXeWRwfFY6Fm0NK8paRyXHeXpG4pr/eRvNkUEoPomEFMQ9nYsBUYQZ omTdEXfd6YTp0vcZQZKY1ZnAsdNLYFvYZgytTOgCucJyUPgMp4/MBoJNvmIEpNvVoXB8 7dnT3Lg0PQ5Xin6JWJp7rguLMlto/Z26MO0qirUtoqeoQJEKIGYa/4RtidkEFhrjKNkZ XqBIcu/jqJLs0H8PnHn7Cd4uXRT1g2iA8wsn7UHz8RUPbPa5/Cvd85YmGlPfZUZjlpMP n4PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20210112.gappssmtp.com header.s=20210112 header.b=wG6BBClF; 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 w65-20020a636244000000b0046f5e5d7310si3681962pgb.828.2022.11.18.04.28.46; Fri, 18 Nov 2022 04:29:00 -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=wG6BBClF; 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 S241899AbiKRM13 (ORCPT + 99 others); Fri, 18 Nov 2022 07:27:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241653AbiKRM0o (ORCPT ); Fri, 18 Nov 2022 07:26:44 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CFF99AC90 for ; Fri, 18 Nov 2022 04:26:16 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id g12so8983777wrs.10 for ; Fri, 18 Nov 2022 04:26:16 -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=Ko+jjIDfILZRTvWmBV6W3WbxjLYlDDq9YeO4lkVcz7M=; b=wG6BBClFrP2ZpUq0SJaBVD26AkZ5G8xLeHuWRnkPNUG3LlK+lWfYOfpgG0tc92N1uK bUTXlgbeYtc5LiKT1YUb/h911q40aey2mzMn78dr2JFvwzletg79ZcqvbOqrXqsNPsLm G2G20KJ/8PP5178vDp02V87OlmQrRXPFUZ0X4zuCszl2nNuRrM7r5jfaJ+MCW4Yr+03y NYHlmAhr7aIddmXYZzez/xrD5V2fac10Sn4OTaFyEWP1LkUWHxMAyJDb92U7QmoxelwL UXB9oa4sFaWx8nqZScC9nLt2IRbGlSv/rrH8gH+Jcb34jmw9LvrWuqIiIPgmzi0KhhBH W9Og== 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=Ko+jjIDfILZRTvWmBV6W3WbxjLYlDDq9YeO4lkVcz7M=; b=abxepKHv4o9oebDCP6ncZ8y+yj01hfG9EsVa4m0ev3dkQ1wCM/vdbmAHRYely2ovwM KP8gdQXpYMLuWQKE/wp5tct7iYQntNbf61R/p8nM5SsSA6g3zcFY+dlZfUeKmTsyjHkq FkZp5SAi38Yylg9Uc0ea8GIkrZzpD4nisUyeg3w/cdiHpz1ZOv3oICWVX+hMW3i0wiGl tcV4CvqiHkvx3xz0EVEiWl0sVfLmEGeRKUGxaGCAKExI4Sxh5HmjAEbv6tYnqLQudPM0 U1ySPSfkZ38XH4NbwV/7tj3BceEI1hTrZ2Au9tbypvmWVYECPqUB/DjIeY8ajc2A+K+a VBHA== X-Gm-Message-State: ANoB5pkWTP7Tudv0dAXKTNdjgt2lrZ4A6ice1GnnA9lPdZm9SA8fASCs s9xHpo7opg3XzONXVbyJG08QsQ== X-Received: by 2002:a5d:5685:0:b0:235:f0a6:fafd with SMTP id f5-20020a5d5685000000b00235f0a6fafdmr4232376wrv.75.1668774374613; Fri, 18 Nov 2022 04:26:14 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Nov 2022 04:26:14 -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 13/15] tty: serial: qcom-geni-serial: use devres for uart port management Date: Fri, 18 Nov 2022 13:25:37 +0100 Message-Id: <20221118122539.384993-14-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=unavailable 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?1749836932833891697?= X-GMAIL-MSGID: =?utf-8?q?1749836932833891697?= From: Bartosz Golaszewski Shrink and simplify the probe() and remove() code by using the managed variant of uart_add_one_port. Signed-off-by: Bartosz Golaszewski --- drivers/tty/serial/qcom_geni_serial.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index 091b8f277a04..cdd476d504da 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1457,7 +1457,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) uport->private_data = &port->private_data; platform_set_drvdata(pdev, port); - ret = uart_add_one_port(drv, uport); + ret = devm_uart_add_one_port(&pdev->dev, drv, uport); if (ret) return ret; @@ -1466,7 +1466,6 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) IRQF_TRIGGER_HIGH, port->name, uport); if (ret) { dev_err(uport->dev, "Failed to get IRQ ret %d\n", ret); - uart_remove_one_port(drv, uport); return ret; } @@ -1483,7 +1482,6 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) port->wakeup_irq); if (ret) { device_init_wakeup(&pdev->dev, false); - uart_remove_one_port(drv, uport); return ret; } } @@ -1493,12 +1491,8 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) static int qcom_geni_serial_remove(struct platform_device *pdev) { - struct qcom_geni_serial_port *port = platform_get_drvdata(pdev); - struct uart_driver *drv = port->private_data.drv; - dev_pm_clear_wake_irq(&pdev->dev); device_init_wakeup(&pdev->dev, false); - uart_remove_one_port(drv, &port->uport); return 0; }