On Tue, 02 Mar 2021, Andy Shevchenko wrote:
> It's convenient and less error prone to use definitions to address
> different cells in an array. For this purpose we may reuse existing
> BAR definitions.
>
> Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
> ---
> drivers/mfd/intel_quark_i2c_gpio.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mfd/intel_quark_i2c_gpio.c
> b/drivers/mfd/intel_quark_i2c_gpio.c
> index 7af22d1399e1..40871ce34e82 100644
> --- a/drivers/mfd/intel_quark_i2c_gpio.c
> +++ b/drivers/mfd/intel_quark_i2c_gpio.c
> @@ -98,14 +98,6 @@ static struct mfd_cell_acpi_match
> intel_quark_acpi_match_gpio = {
> };
>
> static struct mfd_cell intel_quark_mfd_cells[] = {
> - {
> - .id = MFD_GPIO_BAR,
> - .name = "gpio-dwapb",
> - .acpi_match = &intel_quark_acpi_match_gpio,
> - .num_resources = ARRAY_SIZE(intel_quark_gpio_res),
> - .resources = intel_quark_gpio_res,
> - .ignore_resource_conflicts = true,
> - },
> {
> .id = MFD_I2C_BAR,
> .name = "i2c_designware",
> @@ -114,6 +106,14 @@ static struct mfd_cell intel_quark_mfd_cells[] = {
> .resources = intel_quark_i2c_res,
> .ignore_resource_conflicts = true,
> },
> + {
> + .id = MFD_GPIO_BAR,
> + .name = "gpio-dwapb",
> + .acpi_match = &intel_quark_acpi_match_gpio,
> + .num_resources = ARRAY_SIZE(intel_quark_gpio_res),
> + .resources = intel_quark_gpio_res,
> + .ignore_resource_conflicts = true,
> + },
> };
I would make this more explicit.
[MFD_I2C_BAR] = { }
If someone comes along and re-reorders these, it will break.
> static const struct pci_device_id intel_quark_mfd_ids[] = {
> @@ -245,11 +245,11 @@ static int intel_quark_mfd_probe(struct pci_dev *pdev,
> if (ret)
> return ret;
>
> - ret = intel_quark_i2c_setup(pdev, &intel_quark_mfd_cells[1]);
> + ret = intel_quark_i2c_setup(pdev, &intel_quark_mfd_cells[MFD_I2C_BAR]);
> if (ret)
> goto err_unregister_i2c_clk;
>
> - ret = intel_quark_gpio_setup(pdev, &intel_quark_mfd_cells[0]);
> + ret = intel_quark_gpio_setup(pdev,
> &intel_quark_mfd_cells[MFD_GPIO_BAR]);
> if (ret)
> goto err_unregister_i2c_clk;
>
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
