2020-06-10 01:53:43

by Palmer Dabbelt

Subject: [PATCH] e1000e: Squash an unused function warning

From: Palmer Dabbelt <[email protected]>

e1000e_check_me is only used under CONFIG_PM_SLEEP but exists
unconditionally, which triggers a warning.

Signed-off-by: Palmer Dabbelt <[email protected]>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index a279f4fa9962..f7148d1fcba2 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -134,6 +134,7 @@ static const struct e1000e_me_supported me_supported[] = {
{0}
};

+#ifdef CONFIG_PM_SLEEP
static bool e1000e_check_me(u16 device_id)
{
struct e1000e_me_supported *id;
@@ -145,6 +146,7 @@ static bool e1000e_check_me(u16 device_id)

return false;
}
+#endif

/**
* __ew32_prepare - prepare to write to MAC CSR register on certain parts
--
2.27.0.278.ge193c7cf3a9-goog

2020-06-10 17:23:23

by Sasha Neftin

Subject: Re: [Intel-wired-lan] [PATCH] e1000e: Squash an unused function warning

On 6/10/2020 04:49, Palmer Dabbelt wrote:
> From: Palmer Dabbelt <[email protected]>
>
> e1000e_check_me is only used under CONFIG_PM_SLEEP but exists
> unconditionally, which triggers a warning.
>
> Signed-off-by: Palmer Dabbelt <[email protected]>
> ---
> drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index a279f4fa9962..f7148d1fcba2 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -134,6 +134,7 @@ static const struct e1000e_me_supported me_supported[] = {
> {0}
> };
>
> +#ifdef CONFIG_PM_SLEEP
Thanks Palmer for catching this warning,
can we use "__maybe_unused" declaration instead of wrapping? I think it
is more convenient and consistent.
> static bool e1000e_check_me(u16 device_id)
> {
> struct e1000e_me_supported *id;
> @@ -145,6 +146,7 @@ static bool e1000e_check_me(u16 device_id)
>
> return false;
> }
> +#endif
>
> /**
> * __ew32_prepare - prepare to write to MAC CSR register on certain parts
>