emul: remove name param from bus register APIs
Rework the <BUS>_emul_register calls to not pass the name param. The
name param is only used for logging and we can get it from the
struct <BUS>_emul instead.
Signed-off-by: Kumar Gala <galak@kernel.org>
diff --git a/drivers/espi/espi_emul.c b/drivers/espi/espi_emul.c
index a48cc9d..bf9d50a 100644
--- a/drivers/espi/espi_emul.c
+++ b/drivers/espi/espi_emul.c
@@ -199,9 +199,10 @@
return emul_init_for_bus(dev);
}
-int espi_emul_register(const struct device *dev, const char *name, struct espi_emul *emul)
+int espi_emul_register(const struct device *dev, struct espi_emul *emul)
{
struct espi_emul_data *data = dev->data;
+ const char *name = emul->target->dev->name;
sys_slist_append(&data->emuls, &emul->node);
diff --git a/drivers/i2c/i2c_emul.c b/drivers/i2c/i2c_emul.c
index 34317ad..98d5c96 100644
--- a/drivers/i2c/i2c_emul.c
+++ b/drivers/i2c/i2c_emul.c
@@ -118,9 +118,10 @@
return rc;
}
-int i2c_emul_register(const struct device *dev, const char *name, struct i2c_emul *emul)
+int i2c_emul_register(const struct device *dev, struct i2c_emul *emul)
{
struct i2c_emul_data *data = dev->data;
+ const char *name = emul->target->dev->name;
sys_slist_append(&data->emuls, &emul->node);
diff --git a/drivers/spi/spi_emul.c b/drivers/spi/spi_emul.c
index 40d0e1a..183941e 100644
--- a/drivers/spi/spi_emul.c
+++ b/drivers/spi/spi_emul.c
@@ -95,9 +95,10 @@
return emul_init_for_bus(dev);
}
-int spi_emul_register(const struct device *dev, const char *name, struct spi_emul *emul)
+int spi_emul_register(const struct device *dev, struct spi_emul *emul)
{
struct spi_emul_data *data = dev->data;
+ const char *name = emul->target->dev->name;
sys_slist_append(&data->emuls, &emul->node);
diff --git a/include/zephyr/drivers/espi_emul.h b/include/zephyr/drivers/espi_emul.h
index 3566482..be7490c 100644
--- a/include/zephyr/drivers/espi_emul.h
+++ b/include/zephyr/drivers/espi_emul.h
@@ -132,11 +132,10 @@
* Register an emulated device on the controller
*
* @param dev Device that will use the emulator
- * @param name User-friendly name for this emulator
* @param emul eSPI emulator to use
* @return 0 indicating success (always)
*/
-int espi_emul_register(const struct device *dev, const char *name, struct espi_emul *emul);
+int espi_emul_register(const struct device *dev, struct espi_emul *emul);
/**
* Sets the eSPI virtual wire on the host side, which will
diff --git a/include/zephyr/drivers/i2c_emul.h b/include/zephyr/drivers/i2c_emul.h
index cf3de1b..35eb8f5 100644
--- a/include/zephyr/drivers/i2c_emul.h
+++ b/include/zephyr/drivers/i2c_emul.h
@@ -65,11 +65,10 @@
* Register an emulated device on the controller
*
* @param dev Device that will use the emulator
- * @param name User-friendly name for this emulator
* @param emul I2C emulator to use
* @return 0 indicating success (always)
*/
-int i2c_emul_register(const struct device *dev, const char *name, struct i2c_emul *emul);
+int i2c_emul_register(const struct device *dev, struct i2c_emul *emul);
/** Definition of the emulator API */
struct i2c_emul_api {
diff --git a/include/zephyr/drivers/spi_emul.h b/include/zephyr/drivers/spi_emul.h
index 95f650e..5c89fec 100644
--- a/include/zephyr/drivers/spi_emul.h
+++ b/include/zephyr/drivers/spi_emul.h
@@ -69,11 +69,10 @@
* Register an emulated device on the controller
*
* @param dev Device that will use the emulator
- * @param name User-friendly name for this emulator
* @param emul SPI emulator to use
* @return 0 indicating success (always)
*/
-int spi_emul_register(const struct device *dev, const char *name, struct spi_emul *emul);
+int spi_emul_register(const struct device *dev, struct spi_emul *emul);
/** Definition of the emulator API */
struct spi_emul_api {
diff --git a/subsys/emul/emul.c b/subsys/emul/emul.c
index 8586251..7a42fc4 100644
--- a/subsys/emul/emul.c
+++ b/subsys/emul/emul.c
@@ -64,17 +64,17 @@
switch (emul->bus_type) {
#ifdef CONFIG_I2C_EMUL
case EMUL_BUS_TYPE_I2C:
- rc = i2c_emul_register(dev, emul->dev->name, emul->bus.i2c);
+ rc = i2c_emul_register(dev, emul->bus.i2c);
break;
#endif /* CONFIG_I2C_EMUL */
#ifdef CONFIG_ESPI_EMUL
case EMUL_BUS_TYPE_ESPI:
- rc = espi_emul_register(dev, emul->dev->name, emul->bus.espi);
+ rc = espi_emul_register(dev, emul->bus.espi);
break;
#endif /* CONFIG_ESPI_EMUL */
#ifdef CONFIG_SPI_EMUL
case EMUL_BUS_TYPE_SPI:
- rc = spi_emul_register(dev, emul->dev->name, emul->bus.spi);
+ rc = spi_emul_register(dev, emul->bus.spi);
break;
#endif /* CONFIG_SPI_EMUL */
default:
