From patchwork Tue Jan 2 13:33:07 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: 184354 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4450868dyb; Tue, 2 Jan 2024 05:43:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IFwmFDkfwsB3tZHyVNPlG/yPi6Qwr745oeaMdkJTxkQUBEGfchdv5Dt3DKZMmRwISekhS8P X-Received: by 2002:a50:c282:0:b0:556:66d5:d68c with SMTP id o2-20020a50c282000000b0055666d5d68cmr1336424edf.56.1704203033137; Tue, 02 Jan 2024 05:43:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704203033; cv=none; d=google.com; s=arc-20160816; b=SovKB6qN8LNsIbkVTNNAZBVkB6UEVyfc2p5Gg5Wm14IZsUeQz8hGHh4waYkJJeOnlg Q4UQr4IBjZpYe3gGWyKpNHfPl9+wG3OfyBu2bDdqfG2qFiPt03pZngRHbqxwJdcLfBMr wjHkUVSENV6tWyCkVVrw31dqvw1rd1AKmoByJb+JCD4ZaRXO8NbFRfdXI0wf5ZIVGBzu 7Nb9PdF4lF1qEVlhjrmwCNb7zeKv0aMZpORFGQJBsrcoR7jZUMyPaVheKOAPrd5WJGBM mgj6O6lst5G2tCuTyhQZYfoEcQiv0rkH1n0JT0Ks47nFXiW7BdKV3VTEOVbow2fn7MGQ HFUA== 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=nODm6EQDjhZ3dpYRgjvcp1ORTUFigjUok9mHqFbxD8E=; fh=S5rf2bc7VLlSXYQ0EqFAIodb1qEiUfsxulvZhQKZRws=; b=rn6YXTvAH4mZRDk0LElDO/EPF1LosrMC88JZuHdO1Swn/pzUWPuGxSjfx3s/+DW4Ne Vi6ykipoYzIv/fCL0+rnVR3eWKekhH3bCUDQj5/NTPgtjzCH04KwV2a3GiWF5BwcLIe5 /FTB7EeSK3Lg6gJUtHSOX1T9GixbPsYbmS6pFTEO2da3S7CybGM12cUITSU9Ig1OxpTX lLBaZYRFUeRR6VYhynDPF2KJSj6brOUhlE/fWFu1ZyO6aA1qhr3oG2zG9q4LxXC3WS0e oWdd7uqpGZqmaCn0LR/NjPpaMM/XVuXWsDhTNLfJqDdtFjn3nUfhrChESYVLuWNevm0J FrEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-14433-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14433-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id g9-20020a50d5c9000000b0055678085e1bsi1059668edj.187.2024.01.02.05.43.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 05:43:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-14433-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-14433-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14433-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 BEC141F21B66 for ; Tue, 2 Jan 2024 13:43:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DD87713FE2; Tue, 2 Jan 2024 13:42:52 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) (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 D7ED311CB8; Tue, 2 Jan 2024 13:42:48 +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-201.mailbox.org (Postfix) with ESMTPS id 4T4DM34RLKz9sWY; Tue, 2 Jan 2024 14:33:19 +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 1/4] Bluetooth: HCI: Remove HCI_POWER_OFF_TIMEOUT Date: Tue, 2 Jan 2024 14:33:07 +0100 Message-ID: <20240102133311.6712-2-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: 4T4DM34RLKz9sWY X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786986400058613987 X-GMAIL-MSGID: 1786986400058613987 With commit cf75ad8b41d2aa06f98f365d42a3ae8b059daddd, the power off sequence got refactored so that this was no longer necessary, let's remove the leftover define from the header too. Signed-off-by: Jonas Dreßler --- 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 111e8f8e5..cf5d6230c 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -426,7 +426,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 */