[PATCH] media: cec: include linux/debugfs.h and linux/seq_file.h where needed

[PATCH] media: cec: include linux/debugfs.h and linux/seq_file.h where needed

[Jani Nikula]

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 <hverkuil-cisco@xs4all.nl>
Cc: linux-media@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

Depends on commit ae19ba915eb7 ("drm/i915/display: include
media/cec-notifier.h and linux/debugfs.h where needed")
---
 drivers/media/cec/core/cec-adap.c | 5 +++--
 drivers/media/cec/core/cec-core.c | 5 +++--
 drivers/media/cec/core/cec-pin.c  | 3 ++-
 include/media/cec.h               | 1 -
 4 files changed, 8 insertions(+), 6 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 <linux/errno.h>
 #include <linux/init.h>
-#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/kmod.h>
 #include <linux/ktime.h>
-#include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/seq_file.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
diff --git a/drivers/media/cec/core/cec-core.c b/drivers/media/cec/core/cec-core.c
index 48282d272fe6..941a7d3cb9dc 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 <linux/debugfs.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/kmod.h>
-#include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.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 <linux/delay.h>
-#include <linux/slab.h>
 #include <linux/sched/types.h>
+#include <linux/seq_file.h>
+#include <linux/slab.h>
 
 #include <media/cec-pin.h>
 #include "cec-pin-priv.h"
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 <linux/poll.h>
 #include <linux/fs.h>
-#include <linux/debugfs.h>
 #include <linux/device.h>
 #include <linux/cdev.h>
 #include <linux/kthread.h>
-- 
2.39.5

Re: [PATCH] media: cec: include linux/debugfs.h and linux/seq_file.h where needed

[kernel test robot]

Hi Jani,

kernel test robot noticed the following build errors:

[auto build test ERROR on linuxtv-media-pending/master]
[also build test ERROR on linus/master sailus-media-tree/streams sailus-media-tree/master v6.12 next-20241128]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Jani-Nikula/media-cec-include-linux-debugfs-h-and-linux-seq_file-h-where-needed/20241128-120741
base:   https://git.linuxtv.org/media-ci/media-pending.git master
patch link:    https://lore.kernel.org/r/20241127095308.3149411-1-jani.nikula%40intel.com
patch subject: [PATCH] media: cec: include linux/debugfs.h and linux/seq_file.h where needed
config: alpha-allmodconfig (https://download.01.org/0day-ci/archive/20241128/202411281615.esoi7OGQ-lkp@intel.com/config)
compiler: alpha-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241128/202411281615.esoi7OGQ-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202411281615.esoi7OGQ-lkp@intel.com/

All errors (new ones prefixed by >>):

   drivers/media/cec/core/cec-pin-error-inj.c: In function 'cec_pin_show_cmd':
>> drivers/media/cec/core/cec-pin-error-inj.c:243:17: error: implicit declaration of function 'seq_puts' [-Wimplicit-function-declaration]
     243 |                 seq_puts(sf, "any,");
         |                 ^~~~~~~~
>> drivers/media/cec/core/cec-pin-error-inj.c:245:17: error: implicit declaration of function 'seq_printf'; did you mean 'bstr_printf'? [-Wimplicit-function-declaration]
     245 |                 seq_printf(sf, "0x%02x,", cmd);
         |                 ^~~~~~~~~~
         |                 bstr_printf


vim +/seq_puts +243 drivers/media/cec/core/cec-pin-error-inj.c

22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  239  
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  240  static void cec_pin_show_cmd(struct seq_file *sf, u32 cmd, u8 mode)
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  241  {
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  242  	if (cmd == CEC_ERROR_INJ_OP_ANY)
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31 @243  		seq_puts(sf, "any,");
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  244  	else
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31 @245  		seq_printf(sf, "0x%02x,", cmd);
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  246  	switch (mode) {
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  247  	case CEC_ERROR_INJ_MODE_ONCE:
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  248  		seq_puts(sf, "once ");
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  249  		break;
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  250  	case CEC_ERROR_INJ_MODE_ALWAYS:
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  251  		seq_puts(sf, "always ");
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  252  		break;
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  253  	case CEC_ERROR_INJ_MODE_TOGGLE:
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  254  		seq_puts(sf, "toggle ");
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  255  		break;
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  256  	default:
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  257  		seq_puts(sf, "off ");
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  258  		break;
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  259  	}
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  260  }
22712b389e40ae drivers/media/cec/cec-pin-error-inj.c Hans Verkuil 2017-10-31  261  

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

Re: [PATCH] media: cec: include linux/debugfs.h and linux/seq_file.h where needed

[Jani Nikula]

On Wed, 27 Nov 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> 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 <hverkuil-cisco@xs4all.nl>
> Cc: linux-media@vger.kernel.org
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> ---
>
> Depends on commit ae19ba915eb7 ("drm/i915/display: include
> media/cec-notifier.h and linux/debugfs.h where needed")

I'll resend after -rc1 and some backmerges.

BR,
Jani.

-- 
Jani Nikula, Intel

Re: [PATCH] media: cec: include linux/debugfs.h and linux/seq_file.h where needed

[Hans Verkuil]

On 29/11/2024 09:24, Jani Nikula wrote:
> On Wed, 27 Nov 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>> 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 <hverkuil-cisco@xs4all.nl>

That email no longer exists. Just use hverkuil@xs4all.nl or
hansverk@cisco.com, either works, but I prefer my private email.

Regards,

	Hans

>> Cc: linux-media@vger.kernel.org
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>
>> ---
>>
>> Depends on commit ae19ba915eb7 ("drm/i915/display: include
>> media/cec-notifier.h and linux/debugfs.h where needed")
> 
> I'll resend after -rc1 and some backmerges.
> 
> BR,
> Jani.
> 

Re: [PATCH] media: cec: include linux/debugfs.h and linux/seq_file.h where needed

[Jani Nikula]

On Fri, 29 Nov 2024, Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
> On 29/11/2024 09:24, Jani Nikula wrote:
>> On Wed, 27 Nov 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>>> Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>
> That email no longer exists. Just use hverkuil@xs4all.nl or
> hansverk@cisco.com, either works, but I prefer my private email.

Sure. It's just that hverkuil-cisco@xs4all.nl is still all over the
place in MAINTAINERS in Linus' master.

BR,
Jani.


-- 
Jani Nikula, Intel

Re: [PATCH] media: cec: include linux/debugfs.h and linux/seq_file.h where needed

[Hans Verkuil]

On 05/12/2024 14:20, Jani Nikula wrote:
> On Fri, 29 Nov 2024, Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>> On 29/11/2024 09:24, Jani Nikula wrote:
>>> On Wed, 27 Nov 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>>>> Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>>
>> That email no longer exists. Just use hverkuil@xs4all.nl or
>> hansverk@cisco.com, either works, but I prefer my private email.
> 
> Sure. It's just that hverkuil-cisco@xs4all.nl is still all over the
> place in MAINTAINERS in Linus' master.

I'm very sorry, just disregard my email.

I got confused with hans.verkuil@cisco.com, that work email no longer exists.

A few days before I wrote that reply to you I had posted a patch removing the references
to that old work email, and so that was still in my head.

Regards,

	Hans

> 
> BR,
> Jani.
> 
>