GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dm: serial: Adjust serial_setconfig() to use proper API

Browse source 
All driver-model functions should have a device as the first parameter.
Update this function accordingly.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
This commit is contained in:
Simon Glass 2018-12-28 14:23:09 -07:00
parent 67d1b05130
commit 3de04e771c
3 changed files with 11 additions and 11 deletions
drivers/serial
serial-uclass.c
include
serial.h
test/dm
serial.c

9
drivers/serial/serial-uclass.c
View file

@ -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;
}

2
include/serial.h
View file

@ -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);

11
test/dm/serial.c
View file

@ -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)));