From mboxrd@z Thu Jan 1 00:00:00 1970 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 0F2BD185950; Sun, 1 Sep 2024 16:45:51 +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=1725209151; cv=none; b=AKAksTvRvw3p7to0DF3mVyJavLKgX0L3tcBYjTTqaiTp/BWA83QCJnF7rKMZySkp9GJzqYiaMmXNQiX6YwBs3AOEQqcnla+XRLxDwx17dMeSOxCpzz+X2o8MwkMe0P8+uLSzNIVIpkpNcTZsV/eR4NoRy0+SakonitYhkYWEBb8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725209151; c=relaxed/simple; bh=KL1aeYDXfkMf0ZBVGUFkiX60nWnwKKYzb1HhrQleF4k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pLeGsBUwVXz9EYtBONRUKaosBfUJqq+tK95eRaO+sD5hJZ8qINdcSe76Kadg/+LhED1Jg7SNu09bzm07dchSeU6xMixzAUZNZJHFj2i9o5PZAPhDJNTqaI0onrxEeOCJi4whRrGb5D/7gasuRgjnrVPSiLTtwgRFEXCZIczXDf8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mxSfoYb+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mxSfoYb+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89BC4C4CEC3; Sun, 1 Sep 2024 16:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725209150; bh=KL1aeYDXfkMf0ZBVGUFkiX60nWnwKKYzb1HhrQleF4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mxSfoYb+rffanOjKaFH8pjRiOvJI+v9L/2qT5EL9P3kHf2iv5TGrt3mAjciWMeTIH epi2FSmJqbyi6z4o1tdLM7LLH5uHnGHGx8IoE48SsVDjzcsvck+MGUqoaFIEmZ/Ln0 1sPTJXCzNbSn1w4D17rcelh79LiHkaYtOpNzqFyU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Miao Wang , Huacai Chen Subject: [PATCH 6.1 02/71] LoongArch: Remove the unused dma-direct.h Date: Sun, 1 Sep 2024 18:17:07 +0200 Message-ID: <20240901160801.975806106@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240901160801.879647959@linuxfoundation.org> References: <20240901160801.879647959@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miao Wang commit 58aec91efb93338d1cc7acc0a93242613a2a4e5f upstream. dma-direct.h is introduced in commit d4b6f1562a3c3284 ("LoongArch: Add Non-Uniform Memory Access (NUMA) support"). In commit c78c43fe7d42524c ("LoongArch: Use acpi_arch_dma_setup() and remove ARCH_HAS_PHYS_TO_DMA"), ARCH_HAS_PHYS_TO_DMA was deselected and the coresponding phys_to_dma()/ dma_to_phys() functions were removed. However, the unused dma-direct.h was left behind, which is removed by this patch. Cc: Fixes: c78c43fe7d42 ("LoongArch: Use acpi_arch_dma_setup() and remove ARCH_HAS_PHYS_TO_DMA") Signed-off-by: Miao Wang Signed-off-by: Huacai Chen Signed-off-by: Greg Kroah-Hartman --- arch/loongarch/include/asm/dma-direct.h | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 arch/loongarch/include/asm/dma-direct.h diff --git a/arch/loongarch/include/asm/dma-direct.h b/arch/loongarch/include/asm/dma-direct.h deleted file mode 100644 index 75ccd808a2af..000000000000 --- a/arch/loongarch/include/asm/dma-direct.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (C) 2020-2022 Loongson Technology Corporation Limited - */ -#ifndef _LOONGARCH_DMA_DIRECT_H -#define _LOONGARCH_DMA_DIRECT_H - -dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr); -phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); - -#endif /* _LOONGARCH_DMA_DIRECT_H */ -- 2.46.0