| Message ID | 1499011048-24941-1-git-send-email-ogerlitz@mellanox.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Or Gerlitz <ogerlitz@mellanox.com> Date: Sun, 2 Jul 2017 18:57:28 +0300 > If mlx5 is set to be built-in and mlxfw as a module, we > get a link error: > > drivers/built-in.o: In function `mlx5_firmware_flash': > (.text+0x5aed72): undefined reference to `mlxfw_firmware_flash' > > Since we don't want to mandate selecting mlxfw for mlx5 users, we > use the IS_REACHABLE macro to make sure that a stub is exposed > to the caller. > > Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> > Reported-by: Jakub Kicinski <kubakici@wp.pl> > Reported-by: Arnd Bergmann <arnd@arndb.de> Applied, thank you.
diff --git a/drivers/net/ethernet/mellanox/mlxfw/mlxfw.h b/drivers/net/ethernet/mellanox/mlxfw/mlxfw.h index 9ca8538..7a712b6 100644 --- a/drivers/net/ethernet/mellanox/mlxfw/mlxfw.h +++ b/drivers/net/ethernet/mellanox/mlxfw/mlxfw.h @@ -96,7 +96,7 @@ struct mlxfw_dev { u16 psid_size; }; -#if IS_ENABLED(CONFIG_MLXFW) +#if IS_REACHABLE(CONFIG_MLXFW) int mlxfw_firmware_flash(struct mlxfw_dev *mlxfw_dev, const struct firmware *firmware); #else
If mlx5 is set to be built-in and mlxfw as a module, we get a link error: drivers/built-in.o: In function `mlx5_firmware_flash': (.text+0x5aed72): undefined reference to `mlxfw_firmware_flash' Since we don't want to mandate selecting mlxfw for mlx5 users, we use the IS_REACHABLE macro to make sure that a stub is exposed to the caller. Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Reported-by: Jakub Kicinski <kubakici@wp.pl> Reported-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/mellanox/mlxfw/mlxfw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)