| Message ID | 20220120134326.5295-6-sbinding@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | Support Spi in i2c-multi-instantiate driver | expand |
Hi, On 1/20/22 14:43, Stefan Binding wrote: > From: Lucas Tanure <tanureal@opensource.cirrus.com> > > Rename I2C multi instantiate driver to bus-multi-instantiate for > upcoming addition of SPI support > > Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com> > Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > MAINTAINERS | 4 +- > drivers/acpi/scan.c | 2 +- > drivers/platform/x86/Kconfig | 4 +- > drivers/platform/x86/Makefile | 2 +- > ...-instantiate.c => bus-multi-instantiate.c} | 89 +++++++++---------- > 5 files changed, 50 insertions(+), 51 deletions(-) > rename drivers/platform/x86/{i2c-multi-instantiate.c => bus-multi-instantiate.c} (53%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 4e828542b089..4a7e3cff9245 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -388,11 +388,11 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > S: Maintained > F: drivers/acpi/arm64 > > -ACPI I2C MULTI INSTANTIATE DRIVER > +ACPI BUS MULTI INSTANTIATE DRIVER > M: Hans de Goede <hdegoede@redhat.com> > L: platform-driver-x86@vger.kernel.org > S: Maintained > -F: drivers/platform/x86/i2c-multi-instantiate.c > +F: drivers/platform/x86/bus-multi-instantiate.c > > ACPI PCC(Platform Communication Channel) MAILBOX DRIVER > M: Sudeep Holla <sudeep.holla@arm.com> > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c > index 1331756d4cfc..e4fda14572e7 100644 > --- a/drivers/acpi/scan.c > +++ b/drivers/acpi/scan.c > @@ -1738,7 +1738,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) > * must be instantiated for each, each with its own i2c_device_id. > * Normally we only instantiate an i2c-client for the first resource, > * using the ACPI HID as id. These special cases are handled by the > - * drivers/platform/x86/i2c-multi-instantiate.c driver, which knows > + * drivers/platform/x86/bus-multi-instantiate.c driver, which knows > * which i2c_device_id to use for each resource. > */ > {"BSG1160", }, > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > index 24deeeb29af2..616da06aa6b9 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -990,7 +990,7 @@ config TOPSTAR_LAPTOP > > If you have a Topstar laptop, say Y or M here. > > -config I2C_MULTI_INSTANTIATE > +config BUS_MULTI_INSTANTIATE > tristate "I2C multi instantiate pseudo device driver" > depends on I2C && ACPI > help > @@ -999,7 +999,7 @@ config I2C_MULTI_INSTANTIATE > for each device in the firmware-node. > > To compile this driver as a module, choose M here: the module > - will be called i2c-multi-instantiate. > + will be called bus-multi-instantiate. > > config MLX_PLATFORM > tristate "Mellanox Technologies platform support" > diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile > index c12a9b044fd8..b5852e3fbab1 100644 > --- a/drivers/platform/x86/Makefile > +++ b/drivers/platform/x86/Makefile > @@ -110,7 +110,7 @@ obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o > > # Platform drivers > obj-$(CONFIG_FW_ATTR_CLASS) += firmware_attributes_class.o > -obj-$(CONFIG_I2C_MULTI_INSTANTIATE) += i2c-multi-instantiate.o > +obj-$(CONFIG_BUS_MULTI_INSTANTIATE) += bus-multi-instantiate.o > obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o > obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o > obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o > diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/bus-multi-instantiate.c > similarity index 53% > rename from drivers/platform/x86/i2c-multi-instantiate.c > rename to drivers/platform/x86/bus-multi-instantiate.c > index 4956a1df5b90..982dfecfd27c 100644 > --- a/drivers/platform/x86/i2c-multi-instantiate.c > +++ b/drivers/platform/x86/bus-multi-instantiate.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0+ > /* > - * I2C multi-instantiate driver, pseudo driver to instantiate multiple > + * Bus multi-instantiate driver, pseudo driver to instantiate multiple > * i2c-clients from a single fwnode. > * > * Copyright 2018 Hans de Goede <hdegoede@redhat.com> > @@ -21,29 +21,29 @@ > #define IRQ_RESOURCE_GPIO 1 > #define IRQ_RESOURCE_APIC 2 > > -struct i2c_inst_data { > +struct bmi_instance { > const char *type; > unsigned int flags; > int irq_idx; > }; > > -struct i2c_multi_inst_data { > - int num_clients; > - struct i2c_client *clients[]; > +struct bmi { > + int i2c_num; > + struct i2c_client *i2c_devs[]; > }; > > -static int i2c_multi_inst_probe(struct platform_device *pdev) > +static int bmi_probe(struct platform_device *pdev) > { > - struct i2c_multi_inst_data *multi; > - const struct i2c_inst_data *inst_data; > struct i2c_board_info board_info = {}; > + const struct bmi_instance *inst; > struct device *dev = &pdev->dev; > struct acpi_device *adev; > + struct bmi *bmi; > char name[32]; > int i, ret; > > - inst_data = device_get_match_data(dev); > - if (!inst_data) { > + inst = device_get_match_data(dev); > + if (!inst) { > dev_err(dev, "Error ACPI match data is missing\n"); > return -ENODEV; > } > @@ -55,33 +55,32 @@ static int i2c_multi_inst_probe(struct platform_device *pdev) > if (ret < 0) > return ret; > > - multi = devm_kmalloc(dev, struct_size(multi, clients, ret), GFP_KERNEL); > - if (!multi) > + bmi = devm_kmalloc(dev, struct_size(bmi, i2c_devs, ret), GFP_KERNEL); > + if (!bmi) > return -ENOMEM; > > - multi->num_clients = ret; > + bmi->i2c_num = ret; > > - for (i = 0; i < multi->num_clients && inst_data[i].type; i++) { > + for (i = 0; i < bmi->i2c_num && inst[i].type; i++) { > memset(&board_info, 0, sizeof(board_info)); > - strlcpy(board_info.type, inst_data[i].type, I2C_NAME_SIZE); > - snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev), > - inst_data[i].type, i); > + strlcpy(board_info.type, inst[i].type, I2C_NAME_SIZE); > + snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev), inst[i].type, i); > board_info.dev_name = name; > - switch (inst_data[i].flags & IRQ_RESOURCE_TYPE) { > + switch (inst[i].flags & IRQ_RESOURCE_TYPE) { > case IRQ_RESOURCE_GPIO: > - ret = acpi_dev_gpio_irq_get(adev, inst_data[i].irq_idx); > + ret = acpi_dev_gpio_irq_get(adev, inst[i].irq_idx); > if (ret < 0) { > dev_err(dev, "Error requesting irq at index %d: %d\n", > - inst_data[i].irq_idx, ret); > + inst[i].irq_idx, ret); > goto error; > } > board_info.irq = ret; > break; > case IRQ_RESOURCE_APIC: > - ret = platform_get_irq(pdev, inst_data[i].irq_idx); > + ret = platform_get_irq(pdev, inst[i].irq_idx); > if (ret < 0) { > dev_dbg(dev, "Error requesting irq at index %d: %d\n", > - inst_data[i].irq_idx, ret); > + inst[i].irq_idx, ret); > goto error; > } > board_info.irq = ret; > @@ -90,48 +89,48 @@ static int i2c_multi_inst_probe(struct platform_device *pdev) > board_info.irq = 0; > break; > } > - multi->clients[i] = i2c_acpi_new_device(dev, i, &board_info); > - if (IS_ERR(multi->clients[i])) { > - ret = dev_err_probe(dev, PTR_ERR(multi->clients[i]), > + bmi->i2c_devs[i] = i2c_acpi_new_device(dev, i, &board_info); > + if (IS_ERR(bmi->i2c_devs[i])) { > + ret = dev_err_probe(dev, PTR_ERR(bmi->i2c_devs[i]), > "Error creating i2c-client, idx %d\n", i); > goto error; > } > } > - if (i < multi->num_clients) { > + if (i < bmi->i2c_num) { > dev_err(dev, "Error finding driver, idx %d\n", i); > ret = -ENODEV; > goto error; > } > > - platform_set_drvdata(pdev, multi); > + platform_set_drvdata(pdev, bmi); > return 0; > > error: > while (--i >= 0) > - i2c_unregister_device(multi->clients[i]); > + i2c_unregister_device(bmi->i2c_devs[i]); > > return ret; > } > > -static int i2c_multi_inst_remove(struct platform_device *pdev) > +static int bmi_remove(struct platform_device *pdev) > { > - struct i2c_multi_inst_data *multi = platform_get_drvdata(pdev); > + struct bmi *bmi = platform_get_drvdata(pdev); > int i; > > - for (i = 0; i < multi->num_clients; i++) > - i2c_unregister_device(multi->clients[i]); > + for (i = 0; i < bmi->i2c_num; i++) > + i2c_unregister_device(bmi->i2c_devs[i]); > > return 0; > } > > -static const struct i2c_inst_data bsg1160_data[] = { > +static const struct bmi_instance bsg1160_data[] = { > { "bmc150_accel", IRQ_RESOURCE_GPIO, 0 }, > { "bmc150_magn" }, > { "bmg160" }, > {} > }; > > -static const struct i2c_inst_data bsg2150_data[] = { > +static const struct bmi_instance bsg2150_data[] = { > { "bmc150_accel", IRQ_RESOURCE_GPIO, 0 }, > { "bmc150_magn" }, > /* The resources describe a 3th client, but it is not really there. */ > @@ -139,7 +138,7 @@ static const struct i2c_inst_data bsg2150_data[] = { > {} > }; > > -static const struct i2c_inst_data int3515_data[] = { > +static const struct bmi_instance int3515_data[] = { > { "tps6598x", IRQ_RESOURCE_APIC, 0 }, > { "tps6598x", IRQ_RESOURCE_APIC, 1 }, > { "tps6598x", IRQ_RESOURCE_APIC, 2 }, > @@ -148,27 +147,27 @@ static const struct i2c_inst_data int3515_data[] = { > }; > > /* > - * Note new device-ids must also be added to i2c_multi_instantiate_ids in > + * Note new device-ids must also be added to bus_multi_instantiate_ids in > * drivers/acpi/scan.c: acpi_device_enumeration_by_parent(). > */ > -static const struct acpi_device_id i2c_multi_inst_acpi_ids[] = { > +static const struct acpi_device_id bmi_acpi_ids[] = { > { "BSG1160", (unsigned long)bsg1160_data }, > { "BSG2150", (unsigned long)bsg2150_data }, > { "INT3515", (unsigned long)int3515_data }, > { } > }; > -MODULE_DEVICE_TABLE(acpi, i2c_multi_inst_acpi_ids); > +MODULE_DEVICE_TABLE(acpi, bmi_acpi_ids); > > -static struct platform_driver i2c_multi_inst_driver = { > +static struct platform_driver bmi_driver = { > .driver = { > - .name = "I2C multi instantiate pseudo device driver", > - .acpi_match_table = i2c_multi_inst_acpi_ids, > + .name = "Bus multi instantiate pseudo device driver", > + .acpi_match_table = bmi_acpi_ids, > }, > - .probe = i2c_multi_inst_probe, > - .remove = i2c_multi_inst_remove, > + .probe = bmi_probe, > + .remove = bmi_remove, > }; > -module_platform_driver(i2c_multi_inst_driver); > +module_platform_driver(bmi_driver); > > -MODULE_DESCRIPTION("I2C multi instantiate pseudo device driver"); > +MODULE_DESCRIPTION("Bus multi instantiate pseudo device driver"); > MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>"); > MODULE_LICENSE("GPL"); >
On Thu, Jan 20, 2022 at 2:43 PM Stefan Binding <sbinding@opensource.cirrus.com> wrote: > > From: Lucas Tanure <tanureal@opensource.cirrus.com> > > Rename I2C multi instantiate driver to bus-multi-instantiate for > upcoming addition of SPI support TBH, I don't particularly like the new naming. Namely, the "bus" part seems overly generic (and the "bmi" abbreviation brings something totally different to mind). AFAICS this can cover serial interfaces only and specifically the ones where serial links can be represented as resources returned by the ACPI _CRS object. I would call it serial-multi-instance or similar.
Hi, On 1/20/22 19:34, Rafael J. Wysocki wrote: > On Thu, Jan 20, 2022 at 2:43 PM Stefan Binding > <sbinding@opensource.cirrus.com> wrote: >> >> From: Lucas Tanure <tanureal@opensource.cirrus.com> >> >> Rename I2C multi instantiate driver to bus-multi-instantiate for >> upcoming addition of SPI support > > TBH, I don't particularly like the new naming. > > Namely, the "bus" part seems overly generic (and the "bmi" > abbreviation brings something totally different to mind). > > AFAICS this can cover serial interfaces only and specifically the ones > where serial links can be represented as resources returned by the > ACPI _CRS object. > > I would call it serial-multi-instance or similar. serial-multi-instantiate works for me. That also nice matches up with the ACPI_RESOURCE_TYPE_SERIAL_BUS which acpi/scan.c uses to detect these kinda resources. Regards, Hans
diff --git a/MAINTAINERS b/MAINTAINERS index 4e828542b089..4a7e3cff9245 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -388,11 +388,11 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: drivers/acpi/arm64 -ACPI I2C MULTI INSTANTIATE DRIVER +ACPI BUS MULTI INSTANTIATE DRIVER M: Hans de Goede <hdegoede@redhat.com> L: platform-driver-x86@vger.kernel.org S: Maintained -F: drivers/platform/x86/i2c-multi-instantiate.c +F: drivers/platform/x86/bus-multi-instantiate.c ACPI PCC(Platform Communication Channel) MAILBOX DRIVER M: Sudeep Holla <sudeep.holla@arm.com> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 1331756d4cfc..e4fda14572e7 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1738,7 +1738,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) * must be instantiated for each, each with its own i2c_device_id. * Normally we only instantiate an i2c-client for the first resource, * using the ACPI HID as id. These special cases are handled by the - * drivers/platform/x86/i2c-multi-instantiate.c driver, which knows + * drivers/platform/x86/bus-multi-instantiate.c driver, which knows * which i2c_device_id to use for each resource. */ {"BSG1160", }, diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 24deeeb29af2..616da06aa6b9 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -990,7 +990,7 @@ config TOPSTAR_LAPTOP If you have a Topstar laptop, say Y or M here. -config I2C_MULTI_INSTANTIATE +config BUS_MULTI_INSTANTIATE tristate "I2C multi instantiate pseudo device driver" depends on I2C && ACPI help @@ -999,7 +999,7 @@ config I2C_MULTI_INSTANTIATE for each device in the firmware-node. To compile this driver as a module, choose M here: the module - will be called i2c-multi-instantiate. + will be called bus-multi-instantiate. config MLX_PLATFORM tristate "Mellanox Technologies platform support" diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index c12a9b044fd8..b5852e3fbab1 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -110,7 +110,7 @@ obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o # Platform drivers obj-$(CONFIG_FW_ATTR_CLASS) += firmware_attributes_class.o -obj-$(CONFIG_I2C_MULTI_INSTANTIATE) += i2c-multi-instantiate.o +obj-$(CONFIG_BUS_MULTI_INSTANTIATE) += bus-multi-instantiate.o obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/bus-multi-instantiate.c similarity index 53% rename from drivers/platform/x86/i2c-multi-instantiate.c rename to drivers/platform/x86/bus-multi-instantiate.c index 4956a1df5b90..982dfecfd27c 100644 --- a/drivers/platform/x86/i2c-multi-instantiate.c +++ b/drivers/platform/x86/bus-multi-instantiate.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * I2C multi-instantiate driver, pseudo driver to instantiate multiple + * Bus multi-instantiate driver, pseudo driver to instantiate multiple * i2c-clients from a single fwnode. * * Copyright 2018 Hans de Goede <hdegoede@redhat.com> @@ -21,29 +21,29 @@ #define IRQ_RESOURCE_GPIO 1 #define IRQ_RESOURCE_APIC 2 -struct i2c_inst_data { +struct bmi_instance { const char *type; unsigned int flags; int irq_idx; }; -struct i2c_multi_inst_data { - int num_clients; - struct i2c_client *clients[]; +struct bmi { + int i2c_num; + struct i2c_client *i2c_devs[]; }; -static int i2c_multi_inst_probe(struct platform_device *pdev) +static int bmi_probe(struct platform_device *pdev) { - struct i2c_multi_inst_data *multi; - const struct i2c_inst_data *inst_data; struct i2c_board_info board_info = {}; + const struct bmi_instance *inst; struct device *dev = &pdev->dev; struct acpi_device *adev; + struct bmi *bmi; char name[32]; int i, ret; - inst_data = device_get_match_data(dev); - if (!inst_data) { + inst = device_get_match_data(dev); + if (!inst) { dev_err(dev, "Error ACPI match data is missing\n"); return -ENODEV; } @@ -55,33 +55,32 @@ static int i2c_multi_inst_probe(struct platform_device *pdev) if (ret < 0) return ret; - multi = devm_kmalloc(dev, struct_size(multi, clients, ret), GFP_KERNEL); - if (!multi) + bmi = devm_kmalloc(dev, struct_size(bmi, i2c_devs, ret), GFP_KERNEL); + if (!bmi) return -ENOMEM; - multi->num_clients = ret; + bmi->i2c_num = ret; - for (i = 0; i < multi->num_clients && inst_data[i].type; i++) { + for (i = 0; i < bmi->i2c_num && inst[i].type; i++) { memset(&board_info, 0, sizeof(board_info)); - strlcpy(board_info.type, inst_data[i].type, I2C_NAME_SIZE); - snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev), - inst_data[i].type, i); + strlcpy(board_info.type, inst[i].type, I2C_NAME_SIZE); + snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev), inst[i].type, i); board_info.dev_name = name; - switch (inst_data[i].flags & IRQ_RESOURCE_TYPE) { + switch (inst[i].flags & IRQ_RESOURCE_TYPE) { case IRQ_RESOURCE_GPIO: - ret = acpi_dev_gpio_irq_get(adev, inst_data[i].irq_idx); + ret = acpi_dev_gpio_irq_get(adev, inst[i].irq_idx); if (ret < 0) { dev_err(dev, "Error requesting irq at index %d: %d\n", - inst_data[i].irq_idx, ret); + inst[i].irq_idx, ret); goto error; } board_info.irq = ret; break; case IRQ_RESOURCE_APIC: - ret = platform_get_irq(pdev, inst_data[i].irq_idx); + ret = platform_get_irq(pdev, inst[i].irq_idx); if (ret < 0) { dev_dbg(dev, "Error requesting irq at index %d: %d\n", - inst_data[i].irq_idx, ret); + inst[i].irq_idx, ret); goto error; } board_info.irq = ret; @@ -90,48 +89,48 @@ static int i2c_multi_inst_probe(struct platform_device *pdev) board_info.irq = 0; break; } - multi->clients[i] = i2c_acpi_new_device(dev, i, &board_info); - if (IS_ERR(multi->clients[i])) { - ret = dev_err_probe(dev, PTR_ERR(multi->clients[i]), + bmi->i2c_devs[i] = i2c_acpi_new_device(dev, i, &board_info); + if (IS_ERR(bmi->i2c_devs[i])) { + ret = dev_err_probe(dev, PTR_ERR(bmi->i2c_devs[i]), "Error creating i2c-client, idx %d\n", i); goto error; } } - if (i < multi->num_clients) { + if (i < bmi->i2c_num) { dev_err(dev, "Error finding driver, idx %d\n", i); ret = -ENODEV; goto error; } - platform_set_drvdata(pdev, multi); + platform_set_drvdata(pdev, bmi); return 0; error: while (--i >= 0) - i2c_unregister_device(multi->clients[i]); + i2c_unregister_device(bmi->i2c_devs[i]); return ret; } -static int i2c_multi_inst_remove(struct platform_device *pdev) +static int bmi_remove(struct platform_device *pdev) { - struct i2c_multi_inst_data *multi = platform_get_drvdata(pdev); + struct bmi *bmi = platform_get_drvdata(pdev); int i; - for (i = 0; i < multi->num_clients; i++) - i2c_unregister_device(multi->clients[i]); + for (i = 0; i < bmi->i2c_num; i++) + i2c_unregister_device(bmi->i2c_devs[i]); return 0; } -static const struct i2c_inst_data bsg1160_data[] = { +static const struct bmi_instance bsg1160_data[] = { { "bmc150_accel", IRQ_RESOURCE_GPIO, 0 }, { "bmc150_magn" }, { "bmg160" }, {} }; -static const struct i2c_inst_data bsg2150_data[] = { +static const struct bmi_instance bsg2150_data[] = { { "bmc150_accel", IRQ_RESOURCE_GPIO, 0 }, { "bmc150_magn" }, /* The resources describe a 3th client, but it is not really there. */ @@ -139,7 +138,7 @@ static const struct i2c_inst_data bsg2150_data[] = { {} }; -static const struct i2c_inst_data int3515_data[] = { +static const struct bmi_instance int3515_data[] = { { "tps6598x", IRQ_RESOURCE_APIC, 0 }, { "tps6598x", IRQ_RESOURCE_APIC, 1 }, { "tps6598x", IRQ_RESOURCE_APIC, 2 }, @@ -148,27 +147,27 @@ static const struct i2c_inst_data int3515_data[] = { }; /* - * Note new device-ids must also be added to i2c_multi_instantiate_ids in + * Note new device-ids must also be added to bus_multi_instantiate_ids in * drivers/acpi/scan.c: acpi_device_enumeration_by_parent(). */ -static const struct acpi_device_id i2c_multi_inst_acpi_ids[] = { +static const struct acpi_device_id bmi_acpi_ids[] = { { "BSG1160", (unsigned long)bsg1160_data }, { "BSG2150", (unsigned long)bsg2150_data }, { "INT3515", (unsigned long)int3515_data }, { } }; -MODULE_DEVICE_TABLE(acpi, i2c_multi_inst_acpi_ids); +MODULE_DEVICE_TABLE(acpi, bmi_acpi_ids); -static struct platform_driver i2c_multi_inst_driver = { +static struct platform_driver bmi_driver = { .driver = { - .name = "I2C multi instantiate pseudo device driver", - .acpi_match_table = i2c_multi_inst_acpi_ids, + .name = "Bus multi instantiate pseudo device driver", + .acpi_match_table = bmi_acpi_ids, }, - .probe = i2c_multi_inst_probe, - .remove = i2c_multi_inst_remove, + .probe = bmi_probe, + .remove = bmi_remove, }; -module_platform_driver(i2c_multi_inst_driver); +module_platform_driver(bmi_driver); -MODULE_DESCRIPTION("I2C multi instantiate pseudo device driver"); +MODULE_DESCRIPTION("Bus multi instantiate pseudo device driver"); MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>"); MODULE_LICENSE("GPL");