From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0F812FF675 for ; Wed, 3 Sep 2025 14:06:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756908369; cv=none; b=IqlBul/xRjtP3CAFy5Fd5qxHcx8FmlpQqgziRtoy0Vu4rcGMOtaXklffyDSdg3vR+TQWc4XWjHtUue5mET6iHGr6G6TZKsKbIUFIlbNgaKI0/e7DuRhPfKy0K14zwhryvoqw/NJOdTdhkampt29YopENsnR0qBNTtg+A8HjPMk4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756908369; c=relaxed/simple; bh=jJvjScnyctCjCrW9uH75zudbESAeHApJCJbWt0aaOPk=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=u6kkbHL25lRRaiZqHVZYaN5+1qjrscG7LOwfiCJV+yUGDtJzYF91FIL6hBka1LLqGAsBARnT3+aM2bYDadi1dJgR1ip8uH9+WlBkJxbkqJYaf40p6xohwjhSlnzj3rjL+oQHJ/fIdvBYcCIn0/96TnMaYVKhp3R4VHplUwkRXsI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=wbinvd.org; spf=pass smtp.mailfrom=wbinvd.org; dkim=pass (2048-bit key) header.d=wbinvd.org header.i=@wbinvd.org header.b=Bt5I6ns3; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=wbinvd.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wbinvd.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wbinvd.org header.i=@wbinvd.org header.b="Bt5I6ns3" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-24456ce0b96so12033765ad.0 for ; Wed, 03 Sep 2025 07:06:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wbinvd.org; s=wbinvd; t=1756908367; x=1757513167; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=MjiZpHaOGAzMnI40BIIZ11hI7GlxfYSDqRw3KpQJVjo=; b=Bt5I6ns3QjS5/tn1xhY5FCnWhuvycOov8EjcbzyWr7Y8YbBGWa2QNmvX/pg/QDLSE2 fh3KcR0+ygyqy7OaZ4GHumJHQkJ1OxLOvCgnIigQLLmhbb2RLgJAwlS2bbY86M2Sn3l5 9dmP7CsFqWM2Qcp68NBPOteiEBj54ZeCQJHZUL+Wz8TmHEgTUknhZeqox1r6WJy/qc2L tY+fGpFEwH08lFfovSR+/lMShWzK82mLkKpmDf8eOPkCXrX4pUw+x23PFrgrOQmstrJ4 7KWjRo7ZVkGVslzmU4pBvRVtlm1Ap+PX1+S4o9+vsJD0gVMj77grJfD/ZaP089U5BS3J BmHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756908367; x=1757513167; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MjiZpHaOGAzMnI40BIIZ11hI7GlxfYSDqRw3KpQJVjo=; b=vxN552tpRWPYpJ+qNUrJ7jHzmZklPPwBWDlh667CE18Ifr5KiemHW4RPYP9LDGIMUg /x+whIoxoQdfgV3SugkHrF9iFwnilIPBKCQw0l3uCv/m2Htly+BiNNoNoHNYJRjMGXTH NfXrtnT/IlWJvZpDfkaXW9DcgHcjAizUVXbOVLRrr42Y/sSoxwUlIY1RUNh04bSw/r4a sH445pVL2nLtyoihHJO9Y3hFQTNGmDDT+6CjlgT0l8/Iod5/EcQwg2jQuXQN9Qc4JDX8 oAYXRYaiP9HgczPP0nHUQmknwKykH7zgK8N7WJouaVYU5Nsb9rMdeYfCp6P7CWe8wcaw X3KA== X-Forwarded-Encrypted: i=1; AJvYcCUkzrJBYg4aQiAY/fBIWt5ObmokGEFOWlciD2+qCIRlywxRAI361yqkokFbQKtjp7najBd9G2zJZCBQArfmCJ4=@vger.kernel.org X-Gm-Message-State: AOJu0YyV7HLzfFMuO0iNDZYt61I6ylRa8kc2J/cF8pXC6PcUAbRX1VSr F1XuP7pGbXXE3qX7Q7a6gtQbtsja3EBg0wrTMak9FnkQbnfJrZ0P8bLhqdEpZBmsT0I= X-Gm-Gg: ASbGnctyc20NaucueXRkPx+UcQ4pWEA5GEWaD8KK7SVF5g9+xVq3eG3pB+9sAfXDZCG +KsmbSdjZdj69bPdvp9OvOUDaUK+tBCGzVySr6GFHhQHCrAfva4v0mz5incJh+fA5Ro7IX07zVO F0dHLDzA5lfJkyURN8/uwWKG6PRN6NfdGkL7pW5jjIRo712YVpR/bJWoI6ss5uIa5rzPBNrUdee F5YAmDoN6dAJ9g/dR11I6XkguK84r8xwdkMoJCdHzmmsGHiEr43dni3KjZCxbFe6MyrESxPuKt+ pPEiNjIizSs4p1AgahBk8nT8lZw196iK389NuKiW9A9Hnlre9UGhxfFSWc/Lrt+SRvLBNPyJHme gJ29w1Xm0uFNtairydA33BLQs X-Google-Smtp-Source: AGHT+IFlIeuwMod5aclkQ/QtX6cKW39pAdUeh1p1zXqs3QyuVJvhTttccp2Nuw4HcUpvwD0nuOddbQ== X-Received: by 2002:a17:903:186:b0:246:2cb3:5768 with SMTP id d9443c01a7336-24944b4323fmr220781315ad.30.1756908366468; Wed, 03 Sep 2025 07:06:06 -0700 (PDT) Received: from mozart.vkv.me ([192.184.167.117]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-24c9e39094dsm16821705ad.84.2025.09.03.07.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 07:06:05 -0700 (PDT) Date: Wed, 3 Sep 2025 07:06:06 -0700 From: Calvin Owens To: Luiz Augusto von Dentz Cc: Paul Menzel , linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, Luiz Augusto von Dentz , oe-kbuild-all@lists.linux.dev, Marcel Holtmann , Sean Wang , linux-mediatek@lists.infradead.org, naresh.kamboju@linaro.org Subject: [PATCH v3] Bluetooth: Fix build after header cleanup Message-ID: References: <202508300413.OnIedvRh-lkp@intel.com> <84fd4012-966b-4983-b015-ffce06509b5e@molgen.mpg.de> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Some Kconfig dependencies are needed after my recent cleanup, since the core code has its own option. Since btmtksdio does not actually call h4_recv_buf(), move the definitions it uses outside the BT_HCIUART_H4 gate in hci_uart.h to avoid adding a dependency for btmtksdio. The rest I touched (bpa10x, btmtkuart, and btnxpuart) do really call h4_recv_buf(), so the dependency is required, add it for them. Fixes: 0e272fc7e17d ("Bluetooth: remove duplicate h4_recv_buf() in header") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202508300413.OnIedvRh-lkp@intel.com/ Signed-off-by: Calvin Owens --- drivers/bluetooth/Kconfig | 6 ++++++ drivers/bluetooth/hci_uart.h | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index 4ab32abf0f48..7df69ccb6600 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -312,7 +312,9 @@ config BT_HCIBCM4377 config BT_HCIBPA10X tristate "HCI BPA10x USB driver" + depends on BT_HCIUART depends on USB + select BT_HCIUART_H4 help Bluetooth HCI BPA10x USB driver. This driver provides support for the Digianswer BPA 100/105 Bluetooth @@ -437,8 +439,10 @@ config BT_MTKSDIO config BT_MTKUART tristate "MediaTek HCI UART driver" + depends on BT_HCIUART depends on SERIAL_DEV_BUS depends on USB || !BT_HCIBTUSB_MTK + select BT_HCIUART_H4 select BT_MTK help MediaTek Bluetooth HCI UART driver. @@ -483,7 +487,9 @@ config BT_VIRTIO config BT_NXPUART tristate "NXP protocol support" + depends on BT_HCIUART depends on SERIAL_DEV_BUS + select BT_HCIUART_H4 select CRC32 select CRC8 help diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h index 5ea5dd80e297..cbbe79b241ce 100644 --- a/drivers/bluetooth/hci_uart.h +++ b/drivers/bluetooth/hci_uart.h @@ -121,10 +121,6 @@ void hci_uart_set_flow_control(struct hci_uart *hu, bool enable); void hci_uart_set_speeds(struct hci_uart *hu, unsigned int init_speed, unsigned int oper_speed); -#ifdef CONFIG_BT_HCIUART_H4 -int h4_init(void); -int h4_deinit(void); - struct h4_recv_pkt { u8 type; /* Packet type */ u8 hlen; /* Header length */ @@ -162,6 +158,10 @@ struct h4_recv_pkt { .lsize = 2, \ .maxlen = HCI_MAX_FRAME_SIZE \ +#ifdef CONFIG_BT_HCIUART_H4 +int h4_init(void); +int h4_deinit(void); + struct sk_buff *h4_recv_buf(struct hci_dev *hdev, struct sk_buff *skb, const unsigned char *buffer, int count, const struct h4_recv_pkt *pkts, int pkts_count); -- 2.47.2