diff options
Diffstat (limited to 'drivers/staging/gasket/apex_driver.c')
-rw-r--r-- | drivers/staging/gasket/apex_driver.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/gasket/apex_driver.c b/drivers/staging/gasket/apex_driver.c index 0578bf1ba1e9..2be45ee9d061 100644 --- a/drivers/staging/gasket/apex_driver.c +++ b/drivers/staging/gasket/apex_driver.c @@ -294,7 +294,7 @@ static int apex_enter_reset(struct gasket_dev *gasket_dev) /* - Wait for RAM shutdown. */ if (gasket_wait_with_reschedule(gasket_dev, APEX_BAR_INDEX, - APEX_BAR2_REG_SCU_3, 1 << 6, 1 << 6, + APEX_BAR2_REG_SCU_3, BIT(6), BIT(6), APEX_RESET_DELAY, APEX_RESET_RETRY)) { dev_err(gasket_dev->dev, "RAM did not shut down within timeout (%d ms)\n", @@ -340,7 +340,7 @@ static int apex_quit_reset(struct gasket_dev *gasket_dev) /* - Wait for RAM enable. */ if (gasket_wait_with_reschedule(gasket_dev, APEX_BAR_INDEX, - APEX_BAR2_REG_SCU_3, 1 << 6, 0, + APEX_BAR2_REG_SCU_3, BIT(6), 0, APEX_RESET_DELAY, APEX_RESET_RETRY)) { dev_err(gasket_dev->dev, "RAM did not enable within timeout (%d ms)\n", @@ -439,9 +439,7 @@ static int apex_reset(struct gasket_dev *gasket_dev) if (ret) return ret; } - ret = apex_quit_reset(gasket_dev); - - return ret; + return apex_quit_reset(gasket_dev); } /* |