Skip to content

drivers: can: rcar: various code quality fixes #90694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kartben merged 3 commits into from
May 28, 2025
Merged

drivers: can: rcar: various code quality fixes #90694

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
877556a
drivers: can: rcar: always initialize return value variable
henrikbrixandersen May 27, 2025
8378901
drivers: can: rcar: declare the loop condition variables inside the l…
henrikbrixandersen May 27, 2025
1b44147
drivers: can: rcar: merge nested if-statements into one
henrikbrixandersen May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions drivers/can/can_rcar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,12 +474,11 @@ static void can_rcar_isr(const struct device *dev)
static int can_rcar_leave_sleep_mode(const struct can_rcar_cfg *config)
{
uint16_t ctlr, str;
int i;

ctlr = can_rcar_read16(config, RCAR_CAN_CTLR);
ctlr &= ~RCAR_CAN_CTLR_SLPM;
can_rcar_write16(config, RCAR_CAN_CTLR, ctlr);
for (i = 0; i < MAX_STR_READS; i++) {
for (int i = 0; i < MAX_STR_READS; i++) {
str = can_rcar_read16(config, RCAR_CAN_STR);
if (!(str & RCAR_CAN_STR_SLPST)) {
return 0;
Expand All @@ -491,7 +490,6 @@ static int can_rcar_leave_sleep_mode(const struct can_rcar_cfg *config)
static int can_rcar_enter_reset_mode(const struct can_rcar_cfg *config, bool force)
{
uint16_t ctlr;
int i;

ctlr = can_rcar_read16(config, RCAR_CAN_CTLR);
ctlr &= ~RCAR_CAN_CTLR_CANM_MASK;
Expand All @@ -500,7 +498,7 @@ static int can_rcar_enter_reset_mode(const struct can_rcar_cfg *config, bool for
ctlr |= RCAR_CAN_CTLR_CANM_HALT;
}
can_rcar_write16(config, RCAR_CAN_CTLR, ctlr);
for (i = 0; i < MAX_STR_READS; i++) {
for (int i = 0; i < MAX_STR_READS; i++) {
if (can_rcar_read16(config, RCAR_CAN_STR) & RCAR_CAN_STR_RSTST) {
return 0;
}
Expand All @@ -511,7 +509,6 @@ static int can_rcar_enter_reset_mode(const struct can_rcar_cfg *config, bool for
static int can_rcar_enter_halt_mode(const struct can_rcar_cfg *config)
{
uint16_t ctlr;
int i;

ctlr = can_rcar_read16(config, RCAR_CAN_CTLR);
ctlr &= ~RCAR_CAN_CTLR_CANM_MASK;
Expand All @@ -521,7 +518,7 @@ static int can_rcar_enter_halt_mode(const struct can_rcar_cfg *config)
/* Wait for controller to apply high bit timing settings */
k_usleep(1);

for (i = 0; i < MAX_STR_READS; i++) {
for (int i = 0; i < MAX_STR_READS; i++) {
if (can_rcar_read16(config, RCAR_CAN_STR) & RCAR_CAN_STR_HLTST) {
return 0;
}
Expand Down Expand Up @@ -830,7 +827,7 @@ static int can_rcar_recover(const struct device *dev, k_timeout_t timeout)
const struct can_rcar_cfg *config = dev->config;
struct can_rcar_data *data = dev->data;
int64_t start_time;
int ret;
int ret = 0;

if (!data->common.started) {
return -ENETDOWN;
Expand Down Expand Up @@ -1026,11 +1023,9 @@ static int can_rcar_init(const struct device *dev)
data->common.state_change_cb = NULL;
data->common.state_change_cb_user_data = NULL;

if (config->common.phy != NULL) {
if (!device_is_ready(config->common.phy)) {
LOG_ERR("CAN transceiver not ready");
return -ENODEV;
}
if (config->common.phy != NULL && !device_is_ready(config->common.phy)) {
LOG_ERR("CAN transceiver not ready");
return -ENODEV;
}

if (!device_is_ready(config->clock_dev)) {
Expand Down