From patchwork Tue Dec 17 10:00:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13911549 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E74FDE7716A for ; Tue, 17 Dec 2024 10:00:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 64CA110E05D; Tue, 17 Dec 2024 10:00:39 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Xp5uCOGa"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id 89B0210E05D for ; Tue, 17 Dec 2024 10:00:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1734429639; x=1765965639; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=CtfIqk3uPJ2IuBo3XN3BNCRkMC3iY5oG8llYhj1HIdc=; b=Xp5uCOGaEOHC8L23xxfRZ6aoc0ZeD3O7rw/9twxB8B8FFW8d0q3DhlAx SrcqeX0KelG4K5eAaWJKt4aoXjOfbAdqOyg3gBsgYS8WI13Qi2ZscbaCE FM3GIJz0PafXBK0g4IvUst58z11l7e+pmNZBBUj64IA7dVZTewQUdH+qR pO/KDqpLSH8yKIGecYJDXTcP9GuSYTUm0IvIgB5x2k0ChUAIXqZEWHm4D iCuz5VoEwoofC1jQtH/fw7SB2loiAMmWekjUBhs4D1IxRpns42AcOWFXi 7WVWNeu2R8onaHLt2P7zJqX9QTxrTTCHIswLGD5aESMCA+C1z5JRxJoxv w==; X-CSE-ConnectionGUID: Jkogr5nMQqS4sUP5T8jJrg== X-CSE-MsgGUID: cXhzgY7AQ2izbi5juzYZfQ== X-IronPort-AV: E=McAfee;i="6700,10204,11288"; a="34997739" X-IronPort-AV: E=Sophos;i="6.12,241,1728975600"; d="scan'208";a="34997739" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Dec 2024 02:00:39 -0800 X-CSE-ConnectionGUID: RUDqX4cXRBq4r5JHKar7hg== X-CSE-MsgGUID: LwtswJwQRjiYxv6pskKNJg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="97937903" Received: from carterle-desk.ger.corp.intel.com (HELO localhost) ([10.245.246.55]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Dec 2024 02:00:36 -0800 From: Jani Nikula To: linux-media@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, jani.nikula@intel.com, Hans Verkuil Subject: [PATCH v2] media: cec: include linux/debugfs.h and linux/seq_file.h where needed Date: Tue, 17 Dec 2024 12:00:24 +0200 Message-Id: <20241217100024.1858704-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Having cec.h include linux/debugfs.h leads to all users of all cec headers include and depend on debugfs.h and its dependencies for no reason. Drop the include from cec.h, and include debugfs.h and seq_file.h where needed. Sort all the modified include lists while at it. Cc: Hans Verkuil Cc: linux-media@vger.kernel.org Signed-off-by: Jani Nikula --- v2: Rebase, update cec-pin-error-inj.c and cec-gpio.c too Depends on commit ae19ba915eb7 ("drm/i915/display: include media/cec-notifier.h and linux/debugfs.h where needed") in v6.13-rc1 --- drivers/media/cec/core/cec-adap.c | 5 +++-- drivers/media/cec/core/cec-core.c | 5 +++-- drivers/media/cec/core/cec-pin-error-inj.c | 3 ++- drivers/media/cec/core/cec-pin.c | 3 ++- drivers/media/cec/platform/cec-gpio/cec-gpio.c | 7 ++++--- include/media/cec.h | 1 - 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c index c7d36010c890..ba6828ef540e 100644 --- a/drivers/media/cec/core/cec-adap.c +++ b/drivers/media/cec/core/cec-adap.c @@ -7,12 +7,13 @@ #include #include -#include #include #include #include -#include #include +#include +#include +#include #include #include diff --git a/drivers/media/cec/core/cec-core.c b/drivers/media/cec/core/cec-core.c index ca0db8d457b4..e10bd588a586 100644 --- a/drivers/media/cec/core/cec-core.c +++ b/drivers/media/cec/core/cec-core.c @@ -5,13 +5,14 @@ * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ +#include #include #include -#include #include #include -#include #include +#include +#include #include #include diff --git a/drivers/media/cec/core/cec-pin-error-inj.c b/drivers/media/cec/core/cec-pin-error-inj.c index fc0968b9d40e..6e61a04b8168 100644 --- a/drivers/media/cec/core/cec-pin-error-inj.c +++ b/drivers/media/cec/core/cec-pin-error-inj.c @@ -4,8 +4,9 @@ */ #include -#include #include +#include +#include #include #include "cec-pin-priv.h" diff --git a/drivers/media/cec/core/cec-pin.c b/drivers/media/cec/core/cec-pin.c index 330d5d5d86ab..a70451d99ebc 100644 --- a/drivers/media/cec/core/cec-pin.c +++ b/drivers/media/cec/core/cec-pin.c @@ -4,8 +4,9 @@ */ #include -#include #include +#include +#include #include #include "cec-pin-priv.h" diff --git a/drivers/media/cec/platform/cec-gpio/cec-gpio.c b/drivers/media/cec/platform/cec-gpio/cec-gpio.c index cf64e8871fe5..50cdc557c943 100644 --- a/drivers/media/cec/platform/cec-gpio/cec-gpio.c +++ b/drivers/media/cec/platform/cec-gpio/cec-gpio.c @@ -3,11 +3,12 @@ * Copyright 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ -#include -#include #include -#include #include +#include +#include +#include +#include #include #include diff --git a/include/media/cec.h b/include/media/cec.h index 16b412b3131b..0c8e86115b6f 100644 --- a/include/media/cec.h +++ b/include/media/cec.h @@ -10,7 +10,6 @@ #include #include -#include #include #include #include