From patchwork Wed Feb 7 14:38:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Bulwahn X-Patchwork-Id: 197952 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2273963dyb; Wed, 7 Feb 2024 06:40:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IFZhKTcQK972c9n2CV4vtZqRp1hbzdtEu+nvEHWJhIyzSvmxTHBHaIEqS+2L2o4YZ7PdEN7 X-Received: by 2002:a05:6870:5a9a:b0:215:74b6:9b24 with SMTP id dt26-20020a0568705a9a00b0021574b69b24mr4301561oab.35.1707316826172; Wed, 07 Feb 2024 06:40:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707316826; cv=pass; d=google.com; s=arc-20160816; b=Ws0BuWUZPLvIN8prZFzBHSTV53rSlcKeA4jkkgAACMRNLDtzrn4eLP0KDR9stBofXz DsSKTGImds28aGCuRLvSdLYk0i+H+W+pQcOUB+DXzr8admKrwHr/J/hDyYi1xKqqAqD6 JJN5JgkwLnTOHzzf8qRc1QHwiTiSTox8dVpTyiI3joWk2+ynujKMWcXnkWqvIVXSZoLt Na8j0Aaz23C8I7vfDCegUnob6VVKjPdWN/4WaxbfIcO4mu67y8P7i/luQGxe8OQWYXaH guLaXbAfNBrdShZ/kyPf0FpHrB/AeDcQ4TKLIREMR+UvQaD6+TeW+JG/PzPZovGjJgia Yp1A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-id:precedence:message-id:date :subject:cc:to:from:dkim-signature; bh=lE++2qVcHW+CEBtsbdN8eH8qiiSu+9Mbj56gyVDwMac=; fh=/epGXoGUPcI+QEhBhzZEBVnnjqJu/RDRVFUpt0q83DI=; b=nUQMVCY6soun+6MbTxWDB7kQx7Jxn03oVPZeyQxXGJ3ZjpcETwb8tGEiB0zXsZpkkC /AkxcNQjjd+30YdQaZikACXY+kVQRN4hw7Zc+uYCC6Djdn+UlpJllsJEyADXXBZoyKuT 2EBIwgGmeze4AlbVIs5/nggeGV313fu2FVNx7m6ssPWdd8NsY9uufgz5jOIgaM1cqyYp HuRSAJ4fSxthgb5xENFTpOjUq3NpzAWSo1CDaXEVwXcrzTgDMFQt6a02CEv2i44HDv/h e1DJd5zJp3dvP201OFVLtu5b/PvTxn2bBcS5ef+TlYbuwSXGBNmwgqByf9sAxZTFdCQE /qqw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fp55w1d1; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-56629-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56629-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Forwarded-Encrypted: i=2; AJvYcCWq9DheXWLagwG/x9hh0oi21tby0ZxLgkd0VLUQDfrdWEjktI9hMv3vJU9kTotJ5kjEqRpxs88iOQCw/g6UcW+mQYrM+A== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id l13-20020a65680d000000b005c289c5cb5esi1643621pgt.762.2024.02.07.06.40.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 06:40:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56629-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fp55w1d1; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-56629-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56629-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com 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 C73B7B26428 for ; Wed, 7 Feb 2024 14:38:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BF4127F461; Wed, 7 Feb 2024 14:38:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fp55w1d1" Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (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 819A25A10F; Wed, 7 Feb 2024 14:38:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707316713; cv=none; b=biGnd/NKY8U1c+UMABqCZo1UNsOtPKKLd5ZKfcmT35jbs1xh/eqPuU5O+fm8UTQnLtGu3dVq7T6Z6X33sdy73bx3HTTFg3pQtP75bJuoTYcRRpxxFfVxl3qmR22VpK7i0c/EHrtYMVjcQFccGSXUuwWc80kjo7j3/mtF0gt6VW0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707316713; c=relaxed/simple; bh=Y42qZrTeT1zrticJCI2eB78hvcGQgoC9z0KtHukNgEk=; h=From:To:Cc:Subject:Date:Message-Id; b=Gu5nnZwBWdaT1wE0dSkSShDAvED+04Bu880XNlVq67iB9TQ53T6xSrLa35hRvZxs6t7ACOsuHeWBguXtx/cGnX3BZ5Cd3h2CSOnJnB0oXoBZzqaQL6DF4Wim1KoNG0zWZROXNmq48Y25mRr4JyEGtIaojk2gEIqPeb57+cTMpE0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fp55w1d1; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-a2a17f3217aso86098466b.2; Wed, 07 Feb 2024 06:38:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707316709; x=1707921509; darn=vger.kernel.org; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lE++2qVcHW+CEBtsbdN8eH8qiiSu+9Mbj56gyVDwMac=; b=fp55w1d1f4fgJiTe5O1p1c16/pEOio2w/3miKjgdLbVEzRRklq6EOP9RjAEVtCRJC8 l37643r2Poab2vaNXzw5XNO8oWyOtO4mVyi8pBgxel/7KaJSEJ65r/WijN+g9h8ednzK dUnwJNMjSPcDq/2C1N5bxYp0U++y8H2US/3eKQMB8l+/tCK3xEXCQc/7OvG8Gbpkzj5b LHTT8gshEf0+0fhlmqRaAmmjWP7eXXqhtTo4xVy2FuzjCOJiz92kPcwMie9GXZfZlm8g J/UmmkypCjXFYsf/XP7VFUY6iHrR5OdkArakTeMPs7WsKSyf6jPnB00JQtktJI/gTBNG 6YYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707316709; x=1707921509; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lE++2qVcHW+CEBtsbdN8eH8qiiSu+9Mbj56gyVDwMac=; b=XICHjH2eccfy8c6zozplcmiQ6yTfIvG1BIIboP1yNel5ow9Y25deIhGuv8COwLyM88 Hzx2XPp/fY467ree5ouNhWELw7SmxXst5f7mz7WXwFj4Km1HKVYhIPNTHCJoRXmm4bm+ gLcRr4vimbBy8gAOEmvgklduXbBoOOJL0K7INqEf46l3MX/eD67ckY9fbQtyXUx+RLVT 7ooufmxSQhMulcn7079cJi7DT7wNPLTZePYJ1/kCcuFD2b2U5oKYo54a9YhrmVdbiBDi 2U+hTKnFmwjM+kdpDbScIuqXR2BX69RWPHwCilBFUzSepdxzsS9lXDnmkasnzBzjD+Ms sarA== X-Gm-Message-State: AOJu0Yzh3u0s7aXM5+Gu0yFazDSenKZoNMTk/OmRmqSrBZW9Swd7nl2H t84z33sPsBWKJLwC6GFZ7XlmstkOLNMOSDr+o/ZFqRXahSagn4Ug X-Received: by 2002:a17:906:1c5:b0:a35:103e:3614 with SMTP id 5-20020a17090601c500b00a35103e3614mr3841031ejj.52.1707316708889; Wed, 07 Feb 2024 06:38:28 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCV1SGCkbFbH5np12iRMTSf3C23VaNyd1pFuBYbaAmdRdkAf7nHEAwZSaqxOWBF+hPrdUQunP/Th/RSqYO6stTgL9/XL6PoB08KvQruhpOOGgEDUM4vK/OtGz/ebYpuGnLUW4K432aGsSTX3ADljRzcFogfQUNj8mzlxV39Szh2T3A9bDoJAI1M2vAxWNRzR/JHpfnREjymvB0B/VuhOLvpEN9uB8IHL48zDAqxlFAfM4baOKxYFfMYmtnXECNQqGBNCpVgxOWeAepvc+Regj52iX2ez Received: from felia.fritz.box ([2a02:810d:7e40:14b0:81be:a476:88e2:db23]) by smtp.gmail.com with ESMTPSA id s12-20020a17090699cc00b00a35200615d7sm820909ejn.1.2024.02.07.06.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 06:38:28 -0800 (PST) From: Lukas Bulwahn To: Anshuman Khandual , Andrew Morton , Christoph Hellwig , Marek Szyprowski , Robin Murphy , iommu@lists.linux.dev Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG Date: Wed, 7 Feb 2024 15:38:25 +0100 Message-Id: <20240207143825.986-1-lukas.bulwahn@gmail.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790251448259789487 X-GMAIL-MSGID: 1790251448259789487 Commit acc2f3e42d4a ("mm/cma: drop CONFIG_CMA_DEBUG") removes the config CMA_DEBUG and the debug code in cma.c, but misses debug code in kernel/dma/contiguous.c. Remove this dead code from this removed config option. Signed-off-by: Lukas Bulwahn Reviewed-by: Anshuman Khandual --- Andrew, please pick this minor clean-up patch of top of the commit above. kernel/dma/contiguous.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index f005c66f378c..055da410ac71 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -37,12 +37,6 @@ #define pr_fmt(fmt) "cma: " fmt -#ifdef CONFIG_CMA_DEBUG -#ifndef DEBUG -# define DEBUG -#endif -#endif - #include #include