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 95F663909B1 for ; Fri, 29 May 2026 19:27:59 +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=1780082880; cv=none; b=Xyw6bECvNh03Vr7u4kGsMAzh89Mj0EsXaiMb5655T7Vkmpef8PgqVo/zGanenT7iVMNebylBgKtADPAKuhWFJ//8pb1VhVeeYeOgARDlKwKgo/yKGPcMcOpaxRH/zPRzGoABWdSm/1nv4a2Ccm6xGIOXBKRlHSRDpdp0YpRsUAg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780082880; c=relaxed/simple; bh=W8mhfHSI6x+HfeDfnNNFvPGracKYGGhFwYwFpcPH6IU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LutCAsN30p3XwjF6UvnTtnlDyQlmiWF5QoQfga0st8whAQBgJ/l5PCev1W+X1LG9edZshn+2O98po8OJB8xjESzLZzYA07ERFBB5DSHfbnenZVmmK1hQvgjFrMCNG/ZhLF7cnhGuqTm8SnHGIeYr5ACurbqnyAP91wsR/4wPQUU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XOxas/Ct; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XOxas/Ct" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DD011F00899; Fri, 29 May 2026 19:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780082879; bh=AgECUcwy3ygb2nCqHr7sUY4Cy7pY8yfmqOof8+UPmxY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XOxas/CtNHzcMUhscFQN9mzFkyGgDsYlekDP4Wg37qvoEGuyOHXdnzNJLmxTrzY+e FSYcdd5X37JJk0095Wi2nBo9Iy45Pxj75xi8YgGsxd6t0xQ0uqAfyq2ol5XUAeeC6l 4xeqXhB14cVApWw4sk3pZZiBhE2VWK1LTwwY/v5RIuY6fp3mIIrHJWbW09WxS/WrfN S7Ql0lpk1kkcMlTTFKtd6gepSK4xGSLYj/5xPhPfkSqSuMEbqr35sd4GK53xVqnnrb ajsNY/9sVjc1lFcmP+exdw7t3qAwiYwKLM9rkDNfIoAU2ueZDaji71yqfby5UVyylY GbbqbnBvpZ4Jw== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.12.y 2/3] Bluetooth: hci_qca: Migrate to serdev specific shutdown function Date: Fri, 29 May 2026 15:27:55 -0400 Message-ID: <20260529192756.1699014-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260529192756.1699014-1-sashal@kernel.org> References: <2026052859-baboon-unhappy-5be2@gregkh> <20260529192756.1699014-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- drivers/bluetooth/hci_qca.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 586a2ff72a2ae..a7357943122c4 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -2516,11 +2516,10 @@ static void qca_serdev_remove(struct serdev_device *serdev) 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; @@ -2741,11 +2740,11 @@ static void hciqca_coredump(struct device *dev) 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, -- 2.53.0