From patchwork Thu Dec 29 16:19:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 37437 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2481843wrt; Thu, 29 Dec 2022 08:23:52 -0800 (PST) X-Google-Smtp-Source: AMrXdXvyNWV73QgsgkTbi39r5qOelhXqujBCEfpzMptM10sZpMTNM2S7Ks38FnLycDK74MmXHVcX X-Received: by 2002:aa7:c505:0:b0:47f:2419:336c with SMTP id o5-20020aa7c505000000b0047f2419336cmr23817917edq.25.1672331032049; Thu, 29 Dec 2022 08:23:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672331032; cv=none; d=google.com; s=arc-20160816; b=OQtMhTEd++BgGlbFgZttWNaEn54jRxqre5FXgegSJq2kjuvbDW3Bn/Q8cdbYDjSskv /zshw268npzftdrYp5/6L1TBHl1GrCqICUcEAKbN/imh6zGDRwj/pssqLCUSFrAVVXhM Ux4vFuOYUszGcG70JGlys/ykblCX4Q2NlcuLqYCih47D+iPKEbqNrYiobx2ItCsr9U1P oUYSa6qTsGWuuqx65aGgaL+Rn9YqX29PTDA4huhbVHF3H8hfCp2UJ5Wot3DO9ot8i0n5 OzQ6Cemhhauv3vRcLsKFbK7Yf/3Nw92eCPxAJklxzntUe7zrqmsOzHd+KcZpiowc+BbD TS4A== 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=oqAbnpnlAxZCZCp9Pk4QU/Xx94Xjsxer7IEB8LwGfcE=; b=tw55LPbbReWF0BT3m2UG79VLKt1pnfV8q7PMltMN2k+1DPUR+PeT7iB5VxMF+fINPf uDeQs2faNVV4xho8lzBFFnDb46dL6mLiglb+h5K8aAtZJ7+k2cn4Om8qTTvMd6fMMrDa zdJAO6Poe9OXbRoc68AAx1LwPQnMZMKwbEHuyouoUNKvJP/WRvdSgV1fsEEUuqo2Pgmc lreNleMOhf6NwGcJIB0/XtjoRUBjhKKK33Tlniu20JLdbtMNtIbjbqwLBTgRLQVH0PMe opSIwJYas34G/huN3nmuOdYbPyJJFkgvSUVxQjx1gIT4M7CNTOQq8ThVhmhB5QMyypE2 ZkEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20210112.gappssmtp.com header.s=20210112 header.b=CLYCYMRt; 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 k11-20020a50ce4b000000b0046cf2a9bb1csi15287440edj.209.2022.12.29.08.23.23; Thu, 29 Dec 2022 08:23:52 -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=CLYCYMRt; 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 S233477AbiL2QUD (ORCPT + 99 others); Thu, 29 Dec 2022 11:20:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233489AbiL2QT4 (ORCPT ); Thu, 29 Dec 2022 11:19:56 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E1DE13CF9 for ; Thu, 29 Dec 2022 08:19:55 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id z10so17790353wrh.10 for ; Thu, 29 Dec 2022 08:19:55 -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=oqAbnpnlAxZCZCp9Pk4QU/Xx94Xjsxer7IEB8LwGfcE=; b=CLYCYMRtgsROH78TnzkjNDFbHZS2utAHl8Z8QnooOTfxG7BBMv5TM3iAyLxJpsWNMN qHdAmpWiqODp2s1QfFjEXANyR3UuB122hm7gORFYEFVisJ7vPdROVTrpWBDMk30UzGee wakStsHPvUFzY70/dv6n348NkEq9S0gqFmEh5F2J3IWSY0bb/sNrZFcMyLl/ymjbQ6B8 BX3S5bgwhDqu1GGp6l851NMiQBnGWGy/LhZElbwCklGcjnEhFgRI23dIwjarP1V3g2F2 x4+J/vf2+tXw2GORQh0IxxkyTZWpjM0O/Xcteb9uAydF8oIbs33khNRPbtZWS+LSAel3 hrkA== 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=oqAbnpnlAxZCZCp9Pk4QU/Xx94Xjsxer7IEB8LwGfcE=; b=ZZUIeQoSgvWA6LWRvLUxG7M2uyXxO6SNSJMHEQVbe+php1q7aNM67UuEc7R6uNI6XA xZoNt9u9mHmWs8QK4eP18yxGoyM4b5HpHg8DBtpeWXnOoOLViZKHGJX47CZpkjWj/IvJ I0NgQhrIHlyQYa+qcXH0MgNvHgOQ5DsCceFnKdWyGPpgzoVKCogl4ykBlt2605zwgrrB eas8GIjl5aoLlOB5HOWlJx9lFuyZskLq0MXpZz9fqEepxoiRUD/2YTAkrAKEC2H0egsI KXP4kPhZ6sxmKYnMmn+FHVtMmAL+4tpBTq7QURBypkBTw1a+tjw0k7b02w7tlgrv/9i7 ziMw== X-Gm-Message-State: AFqh2koN9ZceEOTuZT7Y6aQbXovD+v35+SQSWbHHqOxAhANcN9UTiUX3 +wZDq3W1VBSVR2IRVxPosA1MaA== X-Received: by 2002:a5d:49c3:0:b0:232:be5c:ec4a with SMTP id t3-20020a5d49c3000000b00232be5cec4amr22347519wrs.6.1672330793956; Thu, 29 Dec 2022 08:19:53 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:8f7a:98d8:9d8d:ced8]) by smtp.gmail.com with ESMTPSA id t5-20020a5d49c5000000b0028cf987d944sm1333199wrs.33.2022.12.29.08.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 08:19:53 -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: [RESEND PATCH 1/2] tty: serial: provide devm_uart_add_one_port() Date: Thu, 29 Dec 2022 17:19:47 +0100 Message-Id: <20221229161948.594102-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221229161948.594102-1-brgl@bgdev.pl> References: <20221229161948.594102-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?1753566183764410651?= X-GMAIL-MSGID: =?utf-8?q?1753566183764410651?= 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 | 48 +++++++++++++++++++ include/linux/serial_core.h | 6 +++ 3 files changed, 57 insertions(+) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index 4249eb4239e0..1d79053070f5 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -448,6 +448,9 @@ RTC SERDEV devm_serdev_device_open() +SERIAL + devm_uart_add_one_port() + SLAVE DMA ENGINE devm_acpi_dma_controller_register() devm_acpi_dma_controller_free() diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index b9fbbee598b8..996aa73705f8 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3217,6 +3217,54 @@ 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); +} + +/** + * devm_uart_add_one_port - managed variant of uart_register_driver() + * @dev: managed device + * @drv: pointer to the uart low level driver structure for this port + * @uport: uart port structure to use for this port. + * + * Context: task context, might sleep + * + * This is a devres wrapper around uart_add_one_port(). It allows the driver + * @drv to register its own uart_port structure with the core driver. The port + * will be unregistered on driver detach. + */ +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 fd59f600094a..3c86b751e3b6 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -857,6 +857,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 */ From patchwork Thu Dec 29 16:19:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 37438 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2481846wrt; Thu, 29 Dec 2022 08:23:52 -0800 (PST) X-Google-Smtp-Source: AMrXdXuYtppgxy0nRduJdTGjWepAcm6cbkBkvhsZjyCh2PQq8aJqzUOL4nH0JroFfpTyaQQtZJjk X-Received: by 2002:aa7:d8da:0:b0:474:5de4:a5d1 with SMTP id k26-20020aa7d8da000000b004745de4a5d1mr29595488eds.39.1672331032050; Thu, 29 Dec 2022 08:23:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672331032; cv=none; d=google.com; s=arc-20160816; b=iRHi32xz1Yov4HRbdCLZFsqouKh4bSdOykfeXPM2hWOBmTGjqvkW8EmQhbHw/icfjW YHYCowsgyq16XFOjLmDKswX84XO1rfP4wrkk/vmyf1BJmQPDo1pojcI2t99V9f/y2vs8 UjJwBVcHjmH2PrENHvswJFQ35xPm+TMI0QteXGoDWUagY2C3FJvgBYTyaXxXngn/HX8j 2UUfzztUBJm/XmlC2RqkU4TSgi4v+fs2Jr91Auy7QgTKbzkDglqk0BZrbUZ1o6JspcQp ktnmFb5P7HJ9jQx8pt2hYo0gEXL7WKNwllUl9WhKlUrkREKnNWcrsbIPSKIuqYYHxAP2 QDeg== 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=nDpCQXfYYeEajOv2TSbXiA18Zt/t8Tes9TDsjO3NMJY=; b=F4jvHX6Dzo8eso7t7x0aqB8Hy9JWhjCiiEMSzDxOQqXWN+IUid2DjNsvFtzYNaGBW8 68ouFNqqRbYVg1Yib2HVqoKKKVDOZhfPSrxtSwh3bzja+POvr49OuMS0RD6r5L6TWgeu DlXKi545Mh8pk9jUETxP7HAZvN6sfg6Om+LTFtaHCCIB2XGtYKBR/YXyClEKKRnP8HZz TEw1L8Nb1G72OukNB9VmU/rTlJYwiK9XEK0219R0cmyL5T6RMchUOsdRc20+zDDvLn+w WSFs85LmIZXco6m9UxIASA7SMlmvJaFwqJsb/lQE6V9Xvfvhn36qF40TrZKJYbCCDOnq bQ3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20210112.gappssmtp.com header.s=20210112 header.b=yNLYjLmF; 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 y11-20020a056402440b00b00468f6919522si19249748eda.564.2022.12.29.08.23.23; Thu, 29 Dec 2022 08:23:52 -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=yNLYjLmF; 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 S229773AbiL2QUH (ORCPT + 99 others); Thu, 29 Dec 2022 11:20:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233619AbiL2QT6 (ORCPT ); Thu, 29 Dec 2022 11:19:58 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1E6F13CFF for ; Thu, 29 Dec 2022 08:19:56 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id h16so17779127wrz.12 for ; Thu, 29 Dec 2022 08:19:56 -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=nDpCQXfYYeEajOv2TSbXiA18Zt/t8Tes9TDsjO3NMJY=; b=yNLYjLmFkWgpBuxsj3eCtD/tewyWrBUjf/VDqz9k2I8wFreh2JLvBmkwy76s9K2bR0 NjIjDB5jdTOVn5I7OCol+10dKoOpfQDSmQsREjobtiiX+no1N6HDVDac63lGKrKVJHI7 a/dNQgrAgkkbX6eo8gyHKBWD9yzCRpHHF0r9Wv+4q7mBUQyxIEGYIw8d/V2Ev/Sv6P6o 70VS6oZnZq4wNuZ+4RA3ID0TQtRQLJnvpOtvu07/0mE5+IGovwljbG+qshXgqn8So+IN W8/Ex4HcTs7FfWUC1aXRWR1q4M9guN1IOsi0ZCSeoyBKrtN90J6A1o80zu4/EZ9dtDYs Fubg== 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=nDpCQXfYYeEajOv2TSbXiA18Zt/t8Tes9TDsjO3NMJY=; b=bEASJQUAPt8i4v6V25wYz83xpuosr2gz53TGnN+5Ddn0q6EKu/bVTH6oXwuUS//10q mX0XpfVTsAQR1cwwNtbzCnk1i8pSbRugolxAgt1bxSm9nlYqs/CyQcWS8pS0b7mXI1eV sKxPzL/5w8sE7nZUp26IiujifWqcRRsUuaPMoxU0qiE6ymdOWQSOWnhez9zeLQMiGcRc EVJmSOH6DxyVqvQNbM4ovPhBfooQKgvSB9idWfxcHmeh0/hVODdPOHeha5jXp7islH1h pxotnkfFBnTEPUqUZrtDjiilas2NJrbjeEzoieEnNdsvn1PfPXtxoHD6hDHybhIZyu86 hRdg== X-Gm-Message-State: AFqh2kqtKfQbN1ZbY6ii3T4wsGiMuFBqo6JBMIyyrbLt1R+Ne7Je+LCI daC11LFvZdYeRlhp5pSa1JR/+A== X-Received: by 2002:adf:e383:0:b0:267:b8df:932b with SMTP id e3-20020adfe383000000b00267b8df932bmr23522542wrm.23.1672330795175; Thu, 29 Dec 2022 08:19:55 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:8f7a:98d8:9d8d:ced8]) by smtp.gmail.com with ESMTPSA id t5-20020a5d49c5000000b0028cf987d944sm1333199wrs.33.2022.12.29.08.19.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 08:19:54 -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: [RESEND PATCH 2/2] tty: serial: qcom-geni-serial: use devres for uart port management Date: Thu, 29 Dec 2022 17:19:48 +0100 Message-Id: <20221229161948.594102-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221229161948.594102-1-brgl@bgdev.pl> References: <20221229161948.594102-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?1753566184120726320?= X-GMAIL-MSGID: =?utf-8?q?1753566184120726320?= 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 b487823f0e61..7d5b51d7fb9e 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1470,7 +1470,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) platform_set_drvdata(pdev, port); port->handle_rx = console ? handle_rx_console : handle_rx_uart; - ret = uart_add_one_port(drv, uport); + ret = devm_uart_add_one_port(&pdev->dev, drv, uport); if (ret) return ret; @@ -1479,7 +1479,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; } @@ -1496,7 +1495,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; } } @@ -1506,12 +1504,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; }