From patchwork Tue Jan 2 13:33:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jonas_Dre=C3=9Fler?= X-Patchwork-Id: 184337 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4446330dyb; Tue, 2 Jan 2024 05:34:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IFH8QqnbvCzgBN+EhB0x8ScIjJay2fhAUUnhMPfPd+ep3EwQt4oYjPsnQGR804iLe1k8ZA1 X-Received: by 2002:a05:600c:a388:b0:40c:6b55:29f1 with SMTP id hn8-20020a05600ca38800b0040c6b5529f1mr9577482wmb.135.1704202455301; Tue, 02 Jan 2024 05:34:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704202455; cv=none; d=google.com; s=arc-20160816; b=yStS6mJfQnwbgPtBQ73CaeoM7Emmn3dOi/7xql/gVDqurVPRgtx91lby+CqzcC7aJW fTPjiVyJzcBASLeA+AE74e7WbWb1DZ72BHZ65eZAZa6UMtO8cGwSnwWxSABavi0QGs5b JjobhXDrXDWgHMlemSv/rg/dsH0KUeFV7RuprX+/aQcZKdM36mgVizhZAUA9wIpLaUhc RvGVgcSGBKP4w6oTGu/SVVrxu2KrjCbT2gyl1efV5AC7ayPe/IYyDjzuN6/RD2qC+Wbu iSIdOrrUv6C5W8oE8kiY4XHKQdueB60VySxh6O4SNAtzruV0pttASFFQxkbr7vW5PZVG cmeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=87+jM2180EUyQlCWJD7RFO6Vd7lJRZXroSxhcNUu254=; fh=S5rf2bc7VLlSXYQ0EqFAIodb1qEiUfsxulvZhQKZRws=; b=FJmuTFXwu4SEpK5DVdWjitZzybbMUz8XUrSIXoofCK05aMqGLaCDn2alkR0zangV5I i7EPqcANUYo+hLpV2eSOmLV0gPzXbvve1VAhavS4S0miEcfq8Eg7qMnOaHPTVenKCdtk CCzkFnJfWVz8OJh/f3q+i1bNq4A4M1w/pU9KDD1hoKs8FOexdBhcc+RryOPTK7LEHH75 jmheHqgQ6p9YXfEo8R0H5dDMcNWR0E5eKJHgN0EDWOUiOysBWyPiRWLMpeZgbZnIcJRu +UcyHu815bfPaUueUzZf533nYdXTWR7ZiqoBmsSPOgqYCtkfpFL2gJsuop9ZZIb8VqEL dWVA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-14404-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14404-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id wi5-20020a170906fd4500b00a26ee6b99adsi6789554ejb.394.2024.01.02.05.34.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 05:34:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-14404-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-14404-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14404-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id BAEDD1F2137D for ; Tue, 2 Jan 2024 13:34:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A32E011719; Tue, 2 Jan 2024 13:33:29 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (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 C01BAFBEC; Tue, 2 Jan 2024 13:33:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=v0yd.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=v0yd.nl Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4T4DM61GV8z9t16; Tue, 2 Jan 2024 14:33:22 +0100 (CET) From: =?utf-8?q?Jonas_Dre=C3=9Fler?= To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz Cc: =?utf-8?q?Jonas_Dre=C3=9Fler?= , asahi@lists.linux.dev, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 2/4] Bluetooth: mgmt: Remove leftover queuing of power_off work Date: Tue, 2 Jan 2024 14:33:08 +0100 Message-ID: <20240102133311.6712-3-verdre@v0yd.nl> In-Reply-To: <20240102133311.6712-1-verdre@v0yd.nl> References: <20240102133311.6712-1-verdre@v0yd.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4T4DM61GV8z9t16 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786985793802105824 X-GMAIL-MSGID: 1786985793802105824 Queuing of power_off work was introduced in these functions with commits 8b064a3ad377c016a17e74f676e7a204c2b8c9f2 and c9910d0fb4fc2ede468b26d45a1d50c309897770 in an effort to clean up state and do things like disconnecting devices before actually powering off the device. After that, commit a3172b7eb4a2719711187cfca12097d2326e85a7 introduced a timeout to ensure that the device actually got powered off, even if some of the cleanup work would never complete. This code later got refactored with commit cf75ad8b41d2aa06f98f365d42a3ae8b059daddd, which made powering off the device synchronous and removed the need for initiating the power_off work from other places. The timeout mentioned above got removed too, because we now also made use of the command timeout during power on/off. These days the power_off work still exists, but it only seems to only be used for HCI_AUTO_OFF functionality, which is why we never noticed those two leftover places where we queue power_off work. So let's remove that code. Signed-off-by: Jonas Dreßler --- net/bluetooth/mgmt.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index d4498037f..c5291e139 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -9760,14 +9760,6 @@ void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr, struct mgmt_ev_device_disconnected ev; struct sock *sk = NULL; - /* The connection is still in hci_conn_hash so test for 1 - * instead of 0 to know if this is the last one. - */ - if (mgmt_powering_down(hdev) && hci_conn_count(hdev) == 1) { - cancel_delayed_work(&hdev->power_off); - queue_work(hdev->req_workqueue, &hdev->power_off.work); - } - if (!mgmt_connected) return; @@ -9824,14 +9816,6 @@ void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, { struct mgmt_ev_connect_failed ev; - /* The connection is still in hci_conn_hash so test for 1 - * instead of 0 to know if this is the last one. - */ - if (mgmt_powering_down(hdev) && hci_conn_count(hdev) == 1) { - cancel_delayed_work(&hdev->power_off); - queue_work(hdev->req_workqueue, &hdev->power_off.work); - } - bacpy(&ev.addr.bdaddr, bdaddr); ev.addr.type = link_to_bdaddr(link_type, addr_type); ev.status = mgmt_status(status);