Skip to content

Commit 9bf17f9

Browse files
henrikbrixandersenfabiobaltieri
authored andcommitted
drivers: can: remove unnecessary asserts in timing callbacks
Remove unnecessary calls to __ASSERT_NO_MSG() in CAN controller driver timing setter callbacks. The CAN API functions can_set_timing and can_set_timing_data() already provide run-time timing parameter validation. Signed-off-by: Henrik Brix Andersen <[email protected]>
1 parent 9c7672b commit 9bf17f9

File tree

5 files changed

+0
-47
lines changed

5 files changed

+0
-47
lines changed

drivers/can/can_esp32_twai.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,6 @@ static int can_esp32_twai_set_timing(const struct device *dev, const struct can_
119119
uint8_t btr0;
120120
uint8_t btr1;
121121

122-
__ASSERT_NO_MSG(timing->sjw >= 0x1 && timing->sjw <= 0x4);
123-
__ASSERT_NO_MSG(timing->prop_seg == 0);
124-
__ASSERT_NO_MSG(timing->phase_seg1 >= 0x1 && timing->phase_seg1 <= 0x10);
125-
__ASSERT_NO_MSG(timing->phase_seg2 >= 0x1 && timing->phase_seg2 <= 0x8);
126-
__ASSERT_NO_MSG(timing->prescaler >= 0x1 && timing->prescaler <= 0x2000);
127-
128122
if (data->started) {
129123
return -EBUSY;
130124
}

drivers/can/can_mcan.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,6 @@ int can_mcan_set_timing(const struct device *dev, const struct can_timing *timin
204204
return -EBUSY;
205205
}
206206

207-
__ASSERT_NO_MSG(timing->prop_seg == 0U);
208-
__ASSERT_NO_MSG(timing->phase_seg1 <= 0x100 && timing->phase_seg1 > 1U);
209-
__ASSERT_NO_MSG(timing->phase_seg2 <= 0x80 && timing->phase_seg2 > 1U);
210-
__ASSERT_NO_MSG(timing->prescaler <= 0x200 && timing->prescaler > 0U);
211-
__ASSERT_NO_MSG(timing->sjw <= 0x80 && timing->sjw > 0U);
212-
213207
k_mutex_lock(&data->lock, K_FOREVER);
214208

215209
nbtp |= FIELD_PREP(CAN_MCAN_NBTP_NSJW, timing->sjw - 1UL) |
@@ -239,12 +233,6 @@ int can_mcan_set_timing_data(const struct device *dev, const struct can_timing *
239233
return -EBUSY;
240234
}
241235

242-
__ASSERT_NO_MSG(timing_data->prop_seg == 0U);
243-
__ASSERT_NO_MSG(timing_data->phase_seg1 <= 0x20 && timing_data->phase_seg1 > 0U);
244-
__ASSERT_NO_MSG(timing_data->phase_seg2 <= 0x10 && timing_data->phase_seg2 > 0U);
245-
__ASSERT_NO_MSG(timing_data->prescaler <= 0x20 && timing_data->prescaler > 0U);
246-
__ASSERT_NO_MSG(timing_data->sjw <= 0x10 && timing_data->sjw > 0U);
247-
248236
k_mutex_lock(&data->lock, K_FOREVER);
249237

250238
dbtp |= FIELD_PREP(CAN_MCAN_DBTP_DSJW, timing_data->sjw - 1UL) |

drivers/can/can_mcp2515.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -389,17 +389,6 @@ static int mcp2515_set_timing(const struct device *dev,
389389
const uint8_t rx0_ctrl = BIT(6) | BIT(5) | BIT(2);
390390
const uint8_t rx1_ctrl = BIT(6) | BIT(5);
391391

392-
__ASSERT(timing->sjw <= 4, "1 <= SJW <= 4");
393-
__ASSERT((timing->prop_seg >= 1) && (timing->prop_seg <= 8),
394-
"1 <= PROP <= 8");
395-
__ASSERT((timing->phase_seg1 >= 1) && (timing->phase_seg1 <= 8),
396-
"1 <= BS1 <= 8");
397-
__ASSERT((timing->phase_seg2 >= 2) && (timing->phase_seg2 <= 8),
398-
"2 <= BS2 <= 8");
399-
__ASSERT(timing->prop_seg + timing->phase_seg1 >= timing->phase_seg2,
400-
"PROP + BS1 >= BS2");
401-
__ASSERT(timing->phase_seg2 > timing->sjw, "BS2 > SJW");
402-
403392
config_buf[0] = cnf3;
404393
config_buf[1] = cnf2;
405394
config_buf[2] = cnf1;

drivers/can/can_mcp251xfd.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -425,12 +425,6 @@ static int mcp251xfd_set_timing(const struct device *dev, const struct can_timin
425425
return -EBUSY;
426426
}
427427

428-
__ASSERT_NO_MSG(timing->prop_seg == 0);
429-
__ASSERT_NO_MSG(timing->sjw >= 1 && timing->sjw <= 128);
430-
__ASSERT_NO_MSG(timing->phase_seg1 >= 2 && timing->phase_seg1 <= 256);
431-
__ASSERT_NO_MSG(timing->phase_seg2 >= 1 && timing->phase_seg2 <= 128);
432-
__ASSERT_NO_MSG(timing->prescaler >= 1 && timing->prescaler <= 256);
433-
434428
k_mutex_lock(&dev_data->mutex, K_FOREVER);
435429

436430
reg = mcp251xfd_get_spi_buf_ptr(dev);
@@ -466,12 +460,6 @@ static int mcp251xfd_set_timing_data(const struct device *dev, const struct can_
466460
return -EBUSY;
467461
}
468462

469-
__ASSERT_NO_MSG(timing->prop_seg == 0);
470-
__ASSERT_NO_MSG(timing->sjw >= 1 && timing->sjw <= 16);
471-
__ASSERT_NO_MSG(timing->phase_seg1 >= 1 && timing->phase_seg1 <= 32);
472-
__ASSERT_NO_MSG(timing->phase_seg2 >= 1 && timing->phase_seg2 <= 16);
473-
__ASSERT_NO_MSG(timing->prescaler >= 1 && timing->prescaler <= 256);
474-
475463
k_mutex_lock(&dev_data->mutex, K_FOREVER);
476464

477465
reg = mcp251xfd_get_spi_buf_ptr(dev);

drivers/can/can_sja1000.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,6 @@ int can_sja1000_set_timing(const struct device *dev, const struct can_timing *ti
108108
uint8_t btr0;
109109
uint8_t btr1;
110110

111-
__ASSERT_NO_MSG(timing->sjw >= 1 && timing->sjw <= 4);
112-
__ASSERT_NO_MSG(timing->prop_seg == 0);
113-
__ASSERT_NO_MSG(timing->phase_seg1 >= 1 && timing->phase_seg1 <= 16);
114-
__ASSERT_NO_MSG(timing->phase_seg2 >= 1 && timing->phase_seg2 <= 8);
115-
__ASSERT_NO_MSG(timing->prescaler >= 1 && timing->prescaler <= 64);
116-
117111
if (data->started) {
118112
return -EBUSY;
119113
}

0 commit comments

Comments
 (0)