linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,16 +305,13 @@ int serial_getconfig(struct udevice *dev, uint *config)
return 0; return 0;
} }
int serial_setconfig(uint config) int serial_setconfig(struct udevice *dev, uint config)
{ {
struct dm_serial_ops *ops; struct dm_serial_ops *ops;
if (!gd->cur_serial_dev) ops = serial_get_ops(dev);
return 0;
ops = serial_get_ops(gd->cur_serial_dev);
if (ops->setconfig) if (ops->setconfig)
return ops->setconfig(gd->cur_serial_dev, config); return ops->setconfig(dev, config);
return 0; 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) #define serial_get_ops(dev) ((struct dm_serial_ops *)(dev)->driver->ops)
int serial_getconfig(struct udevice *dev, uint *config); 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); int serial_getinfo(struct serial_device_info *info);
void atmel_serial_initialize(void); 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 * test with default config which is the only one supported by
* sandbox_serial driver * 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_assertok(serial_getconfig(dev_serial, &value_serial));
ut_assert(value_serial == SERIAL_DEFAULT_CONFIG); ut_assert(value_serial == SERIAL_DEFAULT_CONFIG);
ut_assertok(serial_getinfo(&info_serial)); 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 * sandbox_serial driver: test with wrong parity
*/ */
ut_asserteq(-ENOTSUPP, ut_asserteq(-ENOTSUPP,
serial_setconfig(SERIAL_CONFIG(SERIAL_PAR_ODD, serial_setconfig(dev_serial,
SERIAL_CONFIG(SERIAL_PAR_ODD,
SERIAL_8_BITS, SERIAL_8_BITS,
SERIAL_ONE_STOP))); 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 * sandbox_serial driver: test with wrong bits number
*/ */
ut_asserteq(-ENOTSUPP, ut_asserteq(-ENOTSUPP,
serial_setconfig(SERIAL_CONFIG(SERIAL_PAR_NONE, serial_setconfig(dev_serial,
SERIAL_CONFIG(SERIAL_PAR_NONE,
SERIAL_6_BITS, SERIAL_6_BITS,
SERIAL_ONE_STOP))); 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 * sandbox_serial driver: test with wrong stop bits number
*/ */
ut_asserteq(-ENOTSUPP, ut_asserteq(-ENOTSUPP,
serial_setconfig(SERIAL_CONFIG(SERIAL_PAR_NONE, serial_setconfig(dev_serial,
SERIAL_CONFIG(SERIAL_PAR_NONE,
SERIAL_8_BITS, SERIAL_8_BITS,
SERIAL_TWO_STOP))); SERIAL_TWO_STOP)));