Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2639231lqp; Mon, 25 Mar 2024 05:22:12 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVmdWAjcPsSlswfyIGPaG/X9MQ49xr0X2rbR9gx9JMFxel6Ij1QnTME7Wu87m88QDeTwnob64Kj6Azn+b1LcWRZz43cWDJB2eAV7f6f9w== X-Google-Smtp-Source: AGHT+IFST6fvYEQ86jyQkgRCp3dx+NlHTivqxQJPlwhRIli+I9QSPwXxD7ARuujclMMnQug4e9uZ X-Received: by 2002:a05:6a20:2591:b0:1a3:c656:80aa with SMTP id k17-20020a056a20259100b001a3c65680aamr4562684pzd.7.1711369332198; Mon, 25 Mar 2024 05:22:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711369332; cv=pass; d=google.com; s=arc-20160816; b=AX4jmVdZkm8I0xtIrQGrgssP6oDw2OOo185aGxQk5UKgTQSX8inNYQNFY4/Ds6gf6V 9K8spyVlbsctWlHubUDgrtczlFn81ZbCtSXoAmiJ0N4HZ0NVUn6897TVNtqWETnQKEiz BBD3kmYCzQSiE8S14otsEZ3EI6fsHMa13Wc2TQGPrjINbjqoz8kNkQZykGHAidbFxQ0K ED0EDZCr+NRaAWCh/SX2S2bmZve2u49TFuNS3kLT+wW0X6lF5Njkr03NvikqEbftUsyq KM/98/HpvvbPTl6XtHUgQuDc/Apgl46QZksnZlzUJjw5HrdKPxfk9jpVqwfe0B9eRQxR oi9Q== ARC-Message-Signature: i=2; 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:dkim-signature; bh=XZwXmhSktp8p/XFWSCslXZkf5pGb2EGF/F2IbdIUdKo=; fh=Yq9pTZcfK+NqYz0VmPJ83nJ7o0CwDlSayUr/Cvn/Z8A=; b=MfoLR9Fhv9JHvFNHnMkV/1rc4Hz34ocYKvhhD4OAiZ4pw9zoGdf3m4IpvPCipmjFV6 iZyYOBQAv4BDh4pG02IJT8bDNCxspL7E2RoZZNIwjIbuZAeIarT2pFa0rmO55wC432Hk MxXkf1QM/IxLSe9cdzGTE267i1OiEQWbTuKlY2uUjRxQFn1dHRdo00iNK6iNxI4vYZek BU2wrbUY3eh3HjQXWnf/IryNBx8AGJXsc8AT+oZPm+3ulPIhBdwooD91fyhBgbxxzH+U CuU+X9q8kLycPo9tukOXLnwDmFbRMMipg76ycljZV7rf6lx2ZMgTqvkmwKIcNkkEbv87 Kfgw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=durK70k0; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115928-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115928-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id p18-20020a635b12000000b005cdc5c9d6a2si7691944pgb.576.2024.03.25.05.22.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 05:22:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115928-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=durK70k0; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115928-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115928-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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 sy.mirrors.kernel.org (Postfix) with ESMTPS id C1640B362E7 for ; Mon, 25 Mar 2024 09:48:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 961F916F270; Mon, 25 Mar 2024 03:03:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="durK70k0" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0112C149003; Sun, 24 Mar 2024 23:15:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322120; cv=none; b=bNJgHrlMqta9lB2DiPVfqEix+91iL0JNECeeqz0a25uadG6/QFUIv7jx4c+IsGE/argtyGJH9Iya/jkZxftCtnx76ha9Rzfr2oKhoFW+pKWWHVDvW9WfuED3wSdO/dIPV59m0ddhqpjAbMIkTBmUXWvfeu/waJ6G4J4+5m0m1Vc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322120; c=relaxed/simple; bh=McDveSi4SWayjEssORUvws97Uwz2dL9h7T4A/DSVdMA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Q2AV86+LmTwbYGIp06ny8RnYCY/PIVvcp9fn2Ioi2kllQfx2g+SENT7w+TNS2Kr82okWexphJunTx3hjjrj5zTwitZDnsunYjbPifcYkMzlAK2sW0P3iLHd5QvxxyDrGH1zPcNYFvu0dyiq/zCU60k0wS26mFndp0B5s3aNtY/o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=durK70k0; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4F4AC433F1; Sun, 24 Mar 2024 23:15:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711322119; bh=McDveSi4SWayjEssORUvws97Uwz2dL9h7T4A/DSVdMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=durK70k0hCE1OmCJ9xfCDn4OkBHxHuJty19QeI2h0E9WZHMjC5f8jf6Tkxp7c7Ob0 qAh0PR1TOl96OZc5cNJ43PUx/f8ugqPoV72BJ2HnlEt7KYJOoXWA3dO5U6ivm6mf2m 31tVUGlySoTj+XGxJc4RO6aOxLKbWZB68XJTwmJ0Fi1dbXEpHJwovIt2i1jRtV2Fm3 0hJNmeTtU4vJtbHqZZFQ2Q965hTgTYXVpvVJmeiAAoSlobiWqBhHO52JAFxLJ0+EEu qwcFuHPTEWfopZIdjAp20o/qY4CuRxYvg+LNyYpttHcbPEyr3gIdsIzG4xVaMJumlq SXATX72HqPf6Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.1 194/451] Bluetooth: Remove HCI_POWER_OFF_TIMEOUT Date: Sun, 24 Mar 2024 19:07:50 -0400 Message-ID: <20240324231207.1351418-195-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324231207.1351418-1-sashal@kernel.org> References: <20240324231207.1351418-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Jonas Dreßler [ Upstream commit 968667f2e0345a67a6eea5a502f4659085666564 ] With commit cf75ad8b41d2 ("Bluetooth: hci_sync: Convert MGMT_SET_POWERED"), the power off sequence got refactored so that this timeout was no longer necessary, let's remove the leftover define from the header too. Fixes: cf75ad8b41d2 ("Bluetooth: hci_sync: Convert MGMT_SET_POWERED") Signed-off-by: Jonas Dreßler Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- include/net/bluetooth/hci.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index a674221d151db..c69e09909449f 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -416,7 +416,6 @@ enum { #define HCI_NCMD_TIMEOUT msecs_to_jiffies(4000) /* 4 seconds */ #define HCI_ACL_TX_TIMEOUT msecs_to_jiffies(45000) /* 45 seconds */ #define HCI_AUTO_OFF_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ -#define HCI_POWER_OFF_TIMEOUT msecs_to_jiffies(5000) /* 5 seconds */ #define HCI_LE_CONN_TIMEOUT msecs_to_jiffies(20000) /* 20 seconds */ #define HCI_LE_AUTOCONN_TIMEOUT msecs_to_jiffies(4000) /* 4 seconds */ -- 2.43.0