[U-Boot,3/5] dm: serial: Adjust serial_setconfig() to use proper API

Message ID 20181205195353.246542-4-sjg@chromium.org
State New
Delegated to: Simon Glass
Headers show
Series
  • dm: serial: Fix up some serial API errors
Related show

Commit Message

Simon Glass Dec. 5, 2018, 7:53 p.m.
All driver-model functions should have a device as the first parameter.
Update this function accordingly.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 drivers/serial/serial-uclass.c |  9 +++------
 include/serial.h               |  2 +-
 test/dm/serial.c               | 11 +++++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

Patch

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 81f1067f422..669c82f3793 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -305,16 +305,13 @@  int serial_getconfig(struct udevice *dev, uint *config)
 	return 0;
 }
 
-int serial_setconfig(uint config)
+int serial_setconfig(struct udevice *dev, uint config)
 {
 	struct dm_serial_ops *ops;
 
-	if (!gd->cur_serial_dev)
-		return 0;
-
-	ops = serial_get_ops(gd->cur_serial_dev);
+	ops = serial_get_ops(dev);
 	if (ops->setconfig)
-		return ops->setconfig(gd->cur_serial_dev, config);
+		return ops->setconfig(dev, config);
 
 	return 0;
 }
diff --git a/include/serial.h b/include/serial.h
index 5ba031ab534..8a05a090898 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -282,7 +282,7 @@  struct serial_dev_priv {
 #define serial_get_ops(dev)	((struct dm_serial_ops *)(dev)->driver->ops)
 
 int serial_getconfig(struct udevice *dev, uint *config);
-int serial_setconfig(uint config);
+int serial_setconfig(struct udevice *dev, uint config);
 int serial_getinfo(struct serial_device_info *info);
 
 void atmel_serial_initialize(void);
diff --git a/test/dm/serial.c b/test/dm/serial.c
index 972755face3..f82b4a19e8f 100644
--- a/test/dm/serial.c
+++ b/test/dm/serial.c
@@ -23,7 +23,7 @@  static int dm_test_serial(struct unit_test_state *uts)
 	 * test with default config which is the only one supported by
 	 * sandbox_serial driver
 	 */
-	ut_assertok(serial_setconfig(SERIAL_DEFAULT_CONFIG));
+	ut_assertok(serial_setconfig(dev_serial, SERIAL_DEFAULT_CONFIG));
 	ut_assertok(serial_getconfig(dev_serial, &value_serial));
 	ut_assert(value_serial == SERIAL_DEFAULT_CONFIG);
 	ut_assertok(serial_getinfo(&info_serial));
@@ -39,7 +39,8 @@  static int dm_test_serial(struct unit_test_state *uts)
 	 * sandbox_serial driver: test with wrong parity
 	 */
 	ut_asserteq(-ENOTSUPP,
-		    serial_setconfig(SERIAL_CONFIG(SERIAL_PAR_ODD,
+		    serial_setconfig(dev_serial,
+				     SERIAL_CONFIG(SERIAL_PAR_ODD,
 						   SERIAL_8_BITS,
 						   SERIAL_ONE_STOP)));
 	/*
@@ -47,7 +48,8 @@  static int dm_test_serial(struct unit_test_state *uts)
 	 * sandbox_serial driver: test with wrong bits number
 	 */
 	ut_asserteq(-ENOTSUPP,
-		    serial_setconfig(SERIAL_CONFIG(SERIAL_PAR_NONE,
+		    serial_setconfig(dev_serial,
+				     SERIAL_CONFIG(SERIAL_PAR_NONE,
 						   SERIAL_6_BITS,
 						   SERIAL_ONE_STOP)));
 
@@ -56,7 +58,8 @@  static int dm_test_serial(struct unit_test_state *uts)
 	 * sandbox_serial driver: test with wrong stop bits number
 	 */
 	ut_asserteq(-ENOTSUPP,
-		    serial_setconfig(SERIAL_CONFIG(SERIAL_PAR_NONE,
+		    serial_setconfig(dev_serial,
+				     SERIAL_CONFIG(SERIAL_PAR_NONE,
 						   SERIAL_8_BITS,
 						   SERIAL_TWO_STOP)));