[PATCH net-next] sfc: siena: Have a unique wrapper ifndef for efx channels header

[PATCH net-next] sfc: siena: Have a unique wrapper ifndef for efx channels header

[Saeed Mahameed]

From: Saeed Mahameed <saeedm@nvidia.com>

Both sfc/efx_channels.h and sfc/siena/efx_channels.h used the same
wrapper #ifndef EFX_CHANNELS_H, this patch changes the siena define to be
EFX_SIENA_CHANNELS_H to avoid build system confusion.

This fixes the following build break:
drivers/net/ethernet/sfc/ptp.c:2191:28:
error: ‘efx_copy_channel’ undeclared here (not in a function); did you mean ‘efx_ptp_channel’?
  2191 |  .copy                   = efx_copy_channel,

Fixes: 6e173d3b4af9 ("sfc: Copy shared files needed for Siena (part 1)")
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Cc: Edward Cree <ecree.xilinx@gmail.com>
Cc: Martin Habets <habetsm.xilinx@gmail.com>
---
 drivers/net/ethernet/sfc/siena/efx_channels.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/sfc/siena/efx_channels.h b/drivers/net/ethernet/sfc/siena/efx_channels.h
index 10d78049b885..c4b95a2d770f 100644
--- a/drivers/net/ethernet/sfc/siena/efx_channels.h
+++ b/drivers/net/ethernet/sfc/siena/efx_channels.h
@@ -8,8 +8,8 @@
  * by the Free Software Foundation, incorporated herein by reference.
  */
 
-#ifndef EFX_CHANNELS_H
-#define EFX_CHANNELS_H
+#ifndef EFX_SIENA_CHANNELS_H
+#define EFX_SIENA_CHANNELS_H
 
 extern unsigned int efx_siena_interrupt_mode;
 extern unsigned int efx_siena_rss_cpus;
-- 
2.36.1

Re: [PATCH net-next] sfc: siena: Have a unique wrapper ifndef for efx channels header

[Martin Habets]

On Tue, May 17, 2022 at 11:58:20PM -0700, Saeed Mahameed wrote:
> From: Saeed Mahameed <saeedm@nvidia.com>
> 
> Both sfc/efx_channels.h and sfc/siena/efx_channels.h used the same
> wrapper #ifndef EFX_CHANNELS_H, this patch changes the siena define to be
> EFX_SIENA_CHANNELS_H to avoid build system confusion.
> 
> This fixes the following build break:
> drivers/net/ethernet/sfc/ptp.c:2191:28:
> error: ‘efx_copy_channel’ undeclared here (not in a function); did you mean ‘efx_ptp_channel’?
>   2191 |  .copy                   = efx_copy_channel,
> 
> Fixes: 6e173d3b4af9 ("sfc: Copy shared files needed for Siena (part 1)")
> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

Acked-by: Martin Habets <habetsm.xilinx@gmail.com>

> Cc: Edward Cree <ecree.xilinx@gmail.com>
> Cc: Martin Habets <habetsm.xilinx@gmail.com>
> ---
>  drivers/net/ethernet/sfc/siena/efx_channels.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/sfc/siena/efx_channels.h b/drivers/net/ethernet/sfc/siena/efx_channels.h
> index 10d78049b885..c4b95a2d770f 100644
> --- a/drivers/net/ethernet/sfc/siena/efx_channels.h
> +++ b/drivers/net/ethernet/sfc/siena/efx_channels.h
> @@ -8,8 +8,8 @@
>   * by the Free Software Foundation, incorporated herein by reference.
>   */
>  
> -#ifndef EFX_CHANNELS_H
> -#define EFX_CHANNELS_H
> +#ifndef EFX_SIENA_CHANNELS_H
> +#define EFX_SIENA_CHANNELS_H
>  
>  extern unsigned int efx_siena_interrupt_mode;
>  extern unsigned int efx_siena_rss_cpus;
> -- 
> 2.36.1

Re: [PATCH net-next] sfc: siena: Have a unique wrapper ifndef for efx channels header

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 17 May 2022 23:58:20 -0700 you wrote:
> From: Saeed Mahameed <saeedm@nvidia.com>
> 
> Both sfc/efx_channels.h and sfc/siena/efx_channels.h used the same
> wrapper #ifndef EFX_CHANNELS_H, this patch changes the siena define to be
> EFX_SIENA_CHANNELS_H to avoid build system confusion.
> 
> This fixes the following build break:
> drivers/net/ethernet/sfc/ptp.c:2191:28:
> error: ‘efx_copy_channel’ undeclared here (not in a function); did you mean ‘efx_ptp_channel’?
>   2191 |  .copy                   = efx_copy_channel,
> 
> [...]

Here is the summary with links:
  - [net-next] sfc: siena: Have a unique wrapper ifndef for efx channels header
    https://git.kernel.org/netdev/net-next/c/309ec443079b

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html