diff options
| author | Tom Rini <trini@konsulko.com> | 2022-05-05 19:37:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-05-05 19:37:22 -0400 |
| commit | 03b873b4f41010e4f85a72dd59016bb0b123dde1 (patch) | |
| tree | 3ea6ba397b9ce3db7286537be078944c6daa23b8 /drivers/reset/reset-uclass.c | |
| parent | 5d834bfa5fa61dc9dff94a92672c0a1185cb3a83 (diff) | |
| parent | aa5ea20c71921e062aa91d5c7f924cef5d742ec2 (diff) | |
Merge branch '2022-05-05-assorted-cleanups-and-fixes'
- Assorted minor code cleanups.
- Clean-up the reset uclass code slightly and fix some issues with a
lack of handlers for a case in the driver.
- Y2038 RTC fix
Diffstat (limited to 'drivers/reset/reset-uclass.c')
| -rw-r--r-- | drivers/reset/reset-uclass.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/reset/reset-uclass.c b/drivers/reset/reset-uclass.c index ca9f00a8f24..bcef46039c2 100644 --- a/drivers/reset/reset-uclass.c +++ b/drivers/reset/reset-uclass.c @@ -68,7 +68,7 @@ static int reset_get_by_index_tail(int ret, ofnode node, return ret; } - ret = ops->request(reset_ctl); + ret = ops->request ? ops->request(reset_ctl) : 0; if (ret) { debug("ops->request() failed: %d\n", ret); return ret; @@ -168,7 +168,7 @@ int reset_request(struct reset_ctl *reset_ctl) debug("%s(reset_ctl=%p)\n", __func__, reset_ctl); - return ops->request(reset_ctl); + return ops->request ? ops->request(reset_ctl) : 0; } int reset_free(struct reset_ctl *reset_ctl) @@ -177,7 +177,7 @@ int reset_free(struct reset_ctl *reset_ctl) debug("%s(reset_ctl=%p)\n", __func__, reset_ctl); - return ops->rfree(reset_ctl); + return ops->rfree ? ops->rfree(reset_ctl) : 0; } int reset_assert(struct reset_ctl *reset_ctl) @@ -186,7 +186,7 @@ int reset_assert(struct reset_ctl *reset_ctl) debug("%s(reset_ctl=%p)\n", __func__, reset_ctl); - return ops->rst_assert(reset_ctl); + return ops->rst_assert ? ops->rst_assert(reset_ctl) : 0; } int reset_assert_bulk(struct reset_ctl_bulk *bulk) @@ -208,7 +208,7 @@ int reset_deassert(struct reset_ctl *reset_ctl) debug("%s(reset_ctl=%p)\n", __func__, reset_ctl); - return ops->rst_deassert(reset_ctl); + return ops->rst_deassert ? ops->rst_deassert(reset_ctl) : 0; } int reset_deassert_bulk(struct reset_ctl_bulk *bulk) @@ -230,7 +230,7 @@ int reset_status(struct reset_ctl *reset_ctl) debug("%s(reset_ctl=%p)\n", __func__, reset_ctl); - return ops->rst_status(reset_ctl); + return ops->rst_status ? ops->rst_status(reset_ctl) : 0; } int reset_release_all(struct reset_ctl *reset_ctl, int count) |