From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2021212CDA5; Sun, 7 Jun 2026 10:58:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780829914; cv=none; b=Rmvi88VVa0cYXKu+FxoncDI4cejJWY70rPZORAE4Hceu/+KClKYb0Rd5Vf0dUi9Z9Dtuf9khb50aXcEHGTraNICw7pU22bM2i81X0pAcv35akv7ebb9yFrPYV4v2uMHA2/CGLi3Af9PAo4O9Dhtb9cS8TsuAkRWXEwAGDyQWaEE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780829914; c=relaxed/simple; bh=9RIWgkOhIK6Wui6/0T8k5XIpH7iBmI24/TiXrfesEKI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IKTyJqKbkwqX99r9M7DeA5gOpEhuph43ckdJUBtUOAdb6qKVpFtulv4YXNrV6pKKNc8J8Y556HuX0ieHbYnomuc2/YuvwC7erthLZzMwHL4Utx2JHePnPVK7eYRTHGNCVxg7ZnyIB6V8LB10C6BNIskT8TBeYG9qYtHEzjb9eRc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=X6LKU4qq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="X6LKU4qq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B9671F00893; Sun, 7 Jun 2026 10:58:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780829912; bh=uAB6eM4/33hidlQQIon4ESlj3IiamC0CJTSZJA6m+yE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=X6LKU4qqJm1MlqU99EMHFV+/fZxAQEHbb8xzWSb1jl2hXrqabGtCv19QIEqovol9u oGg1xBFmnGppFd7j2T5h351SBEZjjzNygG9C5T6CxhKi0rYHm/BveoY3ef3rwBvufg m4yz5wVNfOC9cUqn/T8C8TqFkEGOO46w5rGLQH0o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Sasha Levin Subject: [PATCH 6.18 289/315] Bluetooth: hci_qca: Migrate to serdev specific shutdown function Date: Sun, 7 Jun 2026 12:01:16 +0200 Message-ID: <20260607095738.208478629@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260607095727.528828913@linuxfoundation.org> References: <20260607095727.528828913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Uwe Kleine-König [ Upstream commit 12a6a5726c515455935982429ac35dee2307233d ] This saves a cast in the driver. The motivation is stop using the callback .shutdown in qca_serdev_driver.driver to make it possible to drop that. Signed-off-by: Uwe Kleine-König Link: https://patch.msgid.link/261a3384e25c4837d4efee87958805f15d7d4e3c.1765526117.git.u.kleine-koenig@baylibre.com Signed-off-by: Greg Kroah-Hartman Stable-dep-of: 375ba7484132 ("Bluetooth: hci_qca: Convert timeout from jiffies to ms") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/bluetooth/hci_qca.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -2567,11 +2567,10 @@ static void qca_serdev_remove(struct ser hci_uart_unregister_device(&qcadev->serdev_hu); } -static void qca_serdev_shutdown(struct device *dev) +static void qca_serdev_shutdown(struct serdev_device *serdev) { int ret; int timeout = msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS); - struct serdev_device *serdev = to_serdev_device(dev); struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev); struct hci_uart *hu = &qcadev->serdev_hu; struct hci_dev *hdev = hu->hdev; @@ -2793,11 +2792,11 @@ static void hciqca_coredump(struct devic static struct serdev_device_driver qca_serdev_driver = { .probe = qca_serdev_probe, .remove = qca_serdev_remove, + .shutdown = qca_serdev_shutdown, .driver = { .name = "hci_uart_qca", .of_match_table = of_match_ptr(qca_bluetooth_of_match), .acpi_match_table = ACPI_PTR(qca_bluetooth_acpi_match), - .shutdown = qca_serdev_shutdown, .pm = &qca_pm_ops, #ifdef CONFIG_DEV_COREDUMP .coredump = hciqca_coredump,