Skip to content

Commit c49968a

Browse files
drivers: can: rcar: rename CONFIG_CAN_RCAR_MAX_FILTER Kconfig option
Rename Kconfig option CONFIG_CAN_RCAR_MAX_FILTER to CONFIG_CAN_RCAR_MAX_FILTERS to match remaining CAN driver Kconfig option naming. Signed-off-by: Henrik Brix Andersen <henrik@brixandersen.dk>
1 parent 048e645 commit c49968a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

drivers/can/Kconfig.rcar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ config CAN_RCAR
1111
help
1212
Enable Renesas R-Car CAN Driver.
1313

14-
config CAN_RCAR_MAX_FILTER
14+
config CAN_RCAR_MAX_FILTERS
1515
int "Maximum number of concurrent active filters"
1616
depends on CAN_RCAR
1717
default 5

drivers/can/can_rcar.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,9 @@ struct can_rcar_data {
190190
uint8_t tx_tail;
191191
uint8_t tx_unsent;
192192
struct k_mutex rx_mutex;
193-
can_rx_callback_t rx_callback[CONFIG_CAN_RCAR_MAX_FILTER];
194-
void *rx_callback_arg[CONFIG_CAN_RCAR_MAX_FILTER];
195-
struct can_filter filter[CONFIG_CAN_RCAR_MAX_FILTER];
193+
can_rx_callback_t rx_callback[CONFIG_CAN_RCAR_MAX_FILTERS];
194+
void *rx_callback_arg[CONFIG_CAN_RCAR_MAX_FILTERS];
195+
struct can_filter filter[CONFIG_CAN_RCAR_MAX_FILTERS];
196196
enum can_state state;
197197
};
198198

@@ -364,7 +364,7 @@ static void can_rcar_rx_filter_isr(const struct device *dev,
364364
}
365365
#endif /* !CONFIG_CAN_ACCEPT_RTR */
366366

367-
for (i = 0; i < CONFIG_CAN_RCAR_MAX_FILTER; i++) {
367+
for (i = 0; i < CONFIG_CAN_RCAR_MAX_FILTERS; i++) {
368368
if (data->rx_callback[i] == NULL) {
369369
continue;
370370
}
@@ -957,7 +957,7 @@ static inline int can_rcar_add_rx_filter_unlocked(const struct device *dev,
957957
struct can_rcar_data *data = dev->data;
958958
int i;
959959

960-
for (i = 0; i < CONFIG_CAN_RCAR_MAX_FILTER; i++) {
960+
for (i = 0; i < CONFIG_CAN_RCAR_MAX_FILTERS; i++) {
961961
if (data->rx_callback[i] == NULL) {
962962
data->rx_callback_arg[i] = cb_arg;
963963
data->filter[i] = *filter;
@@ -991,7 +991,7 @@ static void can_rcar_remove_rx_filter(const struct device *dev, int filter_id)
991991
{
992992
struct can_rcar_data *data = dev->data;
993993

994-
if (filter_id < 0 || filter_id >= CONFIG_CAN_RCAR_MAX_FILTER) {
994+
if (filter_id < 0 || filter_id >= CONFIG_CAN_RCAR_MAX_FILTERS) {
995995
LOG_ERR("filter ID %d out of bounds", filter_id);
996996
return;
997997
}
@@ -1142,7 +1142,7 @@ static int can_rcar_get_max_filters(const struct device *dev, bool ide)
11421142
{
11431143
ARG_UNUSED(ide);
11441144

1145-
return CONFIG_CAN_RCAR_MAX_FILTER;
1145+
return CONFIG_CAN_RCAR_MAX_FILTERS;
11461146
}
11471147

11481148
static DEVICE_API(can, can_rcar_driver_api) = {

0 commit comments

Comments
 (0)