diff options
Diffstat (limited to 'common/serdev.c')
-rw-r--r-- | common/serdev.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/common/serdev.c b/common/serdev.c index 3e0da0846e..5399a20627 100644 --- a/common/serdev.c +++ b/common/serdev.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <common.h> #include <serdev.h> @@ -73,7 +74,7 @@ int serdev_device_open(struct serdev_device *serdev) if (!serdev->fifo) return -ENOMEM; - ret = poller_async_register(&serdev->poller); + ret = poller_async_register(&serdev->poller, "serdev"); if (ret) return ret; @@ -84,10 +85,7 @@ int serdev_device_open(struct serdev_device *serdev) p = dev_add_param_uint64(serdev->dev, "polling_interval", serdev_device_set_polling_interval, NULL, &serdev->polling_interval, "%llu", serdev); - if (IS_ERR(p)) - return PTR_ERR(p); - - return 0; + return PTR_ERR_OR_ZERO(p); } unsigned int serdev_device_set_baudrate(struct serdev_device *serdev, @@ -134,15 +132,15 @@ static int serdev_device_reader_receive_buf(struct serdev_device *serdev, const unsigned char *buf, size_t size) { - struct device_d *dev = serdev->dev; + struct device *dev = serdev->dev; struct serdev_device_reader *r = dev->priv; const size_t room = min(r->capacity - r->len, size); memcpy(r->buf + r->len, buf, room); r->len += room; /* - * It's important we return 'size' even if we didn't trully - * consume all of the data, since otherwise serdev will keep + * It's important we return 'size' even if we didn't truly + * consume all of the data, since otherwise, serdev will keep * re-executing us until we do. Given the logic above that * would mean infinite loop. */ @@ -155,7 +153,7 @@ static int serdev_device_reader_receive_buf(struct serdev_device *serdev, * @serdev: Underlying serdev device * @capacity: Storage capacity of the reader * - * This function is inteded for creating of reader serdev devices that + * This function is intended for creating of reader serdev devices that * can be used in conjunction with serdev_device_read() to perform * trivial fixed length reads from a serdev device. */ @@ -188,7 +186,7 @@ int serdev_device_reader_open(struct serdev_device *serdev, size_t capacity) int serdev_device_read(struct serdev_device *serdev, unsigned char *buf, size_t count, unsigned long timeout) { - struct device_d *dev = serdev->dev; + struct device *dev = serdev->dev; struct serdev_device_reader *r = dev->priv; int ret; |