Commit 65d78b8d authored by Adam Borowski's avatar Adam Borowski Committed by Wolfram Sang
Browse files

i2c: mlxbf: depend on ACPI; clean away ifdeffage 



This fixes maybe_unused warnings/errors.

According to a comment during device tree removal, only ACPI is supported,
thus let's actually require it.

Fixes: be18c5ed ("i2c: mlxbf: remove device tree support")
Signed-off-by: default avatarAdam Borowski <kilobyte@angband.pl>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent fdf23c62

drivers/i2c/busses/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -764,6 +764,7 @@ config I2C_LPC2K 
config I2C_MLXBF

        tristate "Mellanox BlueField I2C controller"

        depends on MELLANOX_PLATFORM && ARM64

	depends on ACPI

	select I2C_SLAVE

        help

          Enabling this option will add I2C SMBus support for Mellanox BlueField

drivers/i2c/busses/i2c-mlxbf.c

+0 −9
Original line number Diff line number Diff line
@@ -2247,7 +2247,6 @@ static struct i2c_adapter_quirks mlxbf_i2c_quirks = { 
	.max_write_len = MLXBF_I2C_MASTER_DATA_W_LENGTH,

};



#ifdef CONFIG_ACPI

static const struct acpi_device_id mlxbf_i2c_acpi_ids[] = {

	{ "MLNXBF03", (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_1] },

	{ "MLNXBF23", (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_2] },
@@ -2282,12 +2281,6 @@ static int mlxbf_i2c_acpi_probe(struct device *dev, struct mlxbf_i2c_priv *priv) 


	return 0;

}

#else

static int mlxbf_i2c_acpi_probe(struct device *dev, struct mlxbf_i2c_priv *priv)

{

	return -ENOENT;

}

#endif /* CONFIG_ACPI */



static int mlxbf_i2c_probe(struct platform_device *pdev)

{
@@ -2490,9 +2483,7 @@ static struct platform_driver mlxbf_i2c_driver = { 
	.remove = mlxbf_i2c_remove,

	.driver = {

		.name = "i2c-mlxbf",

#ifdef CONFIG_ACPI

		.acpi_match_table = ACPI_PTR(mlxbf_i2c_acpi_ids),

#endif /* CONFIG_ACPI  */

	},

};