On Tue, 17 Dec 2024, Jani Nikula <jani.nikula@xxxxxxxxx> 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@xxxxxxxxx>
> Cc: linux-media@xxxxxxxxxxxxxxx
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Ping?
>
> ---
>
> 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 <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 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 <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-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 <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/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/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 <linux/module.h>
> -#include <linux/interrupt.h>
> #include <linux/delay.h>
> -#include <linux/platform_device.h>
> #include <linux/gpio/consumer.h>
> +#include <linux/interrupt.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/seq_file.h>
> #include <media/cec-notifier.h>
> #include <media/cec-pin.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>
--
Jani Nikula, Intel
