Skip to content

Commit daf116a

Browse files
GeorgeCGVcarlescufi
authored andcommitted
drivers: ethernet: adin2111: minor corrections of is_adin2111
* Make `is_adin2111` a const. * Check `is_adin2111` before processing port 2 related events. Signed-off-by: Georgij Cernysiov <[email protected]>
1 parent fd9a947 commit daf116a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/ethernet/eth_adin2111.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ static void adin2111_offload_thread(void *p1, void *p2, void *p3)
651651
const struct device *dev = p1;
652652
struct adin2111_data *ctx = dev->data;
653653
const struct adin2111_config *adin_cfg = dev->config;
654-
bool is_adin2111 = (adin_cfg->id == ADIN2111_MAC);
654+
const bool is_adin2111 = (adin_cfg->id == ADIN2111_MAC);
655655
uint32_t status0;
656656
uint32_t status1;
657657
int ret;
@@ -689,7 +689,7 @@ static void adin2111_offload_thread(void *p1, void *p2, void *p3)
689689
}
690690

691691
/* handle port 2 phy interrupts */
692-
if ((status1 & ADIN2111_STATUS1_PHYINT) && is_adin2111) {
692+
if (is_adin2111 && (status1 & ADIN2111_STATUS1_PHYINT)) {
693693
adin2111_port_on_phyint(ctx->port[1]);
694694
}
695695

@@ -700,7 +700,7 @@ static void adin2111_offload_thread(void *p1, void *p2, void *p3)
700700
goto continue_unlock;
701701
}
702702
}
703-
if ((status1 & ADIN2111_STATUS1_P2_RX_RDY ) && is_adin2111) {
703+
if (is_adin2111 && (status1 & ADIN2111_STATUS1_P2_RX_RDY)) {
704704
ret = eth_adin2111_oa_data_read(dev, 1);
705705
if (ret < 0) {
706706
goto continue_unlock;
@@ -730,7 +730,7 @@ static void adin2111_offload_thread(void *p1, void *p2, void *p3)
730730
}
731731

732732
/* handle port 2 rx */
733-
if ((status1 & ADIN2111_STATUS1_P2_RX_RDY) && is_adin2111) {
733+
if (is_adin2111 && (status1 & ADIN2111_STATUS1_P2_RX_RDY)) {
734734
do {
735735
ret = adin2111_read_fifo(dev, 1U);
736736
if (ret < 0) {
@@ -997,7 +997,7 @@ static int adin2111_write_filter_address(const struct device *dev,
997997
static int adin2111_filter_multicast(const struct device *dev)
998998
{
999999
const struct adin2111_config *cfg = dev->config;
1000-
bool is_adin2111 = (cfg->id == ADIN2111_MAC);
1000+
const bool is_adin2111 = (cfg->id == ADIN2111_MAC);
10011001
uint8_t mm[NET_ETH_ADDR_LEN] = {BIT(0), 0U, 0U, 0U, 0U, 0U};
10021002
uint8_t mmask[NET_ETH_ADDR_LEN] = {0xFFU, 0U, 0U, 0U, 0U, 0U};
10031003
uint32_t rules = ADIN2111_ADDR_APPLY2PORT1 |
@@ -1012,7 +1012,7 @@ static int adin2111_filter_multicast(const struct device *dev)
10121012
static int adin2111_filter_broadcast(const struct device *dev)
10131013
{
10141014
const struct adin2111_config *cfg = dev->config;
1015-
bool is_adin2111 = (cfg->id == ADIN2111_MAC);
1015+
const bool is_adin2111 = (cfg->id == ADIN2111_MAC);
10161016
uint8_t mac[NET_ETH_ADDR_LEN] = {0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU};
10171017
uint32_t rules = ADIN2111_ADDR_APPLY2PORT1 |
10181018
(is_adin2111 ? ADIN2111_ADDR_APPLY2PORT2 : 0) |
@@ -1132,7 +1132,7 @@ static int eth_adin2111_set_promiscuous(const struct device *dev, const uint16_t
11321132
bool enable)
11331133
{
11341134
const struct adin2111_config *cfg = dev->config;
1135-
bool is_adin2111 = (cfg->id == ADIN2111_MAC);
1135+
const bool is_adin2111 = (cfg->id == ADIN2111_MAC);
11361136
uint32_t fwd_mask;
11371137

11381138
if ((!is_adin2111 && port_idx > 0) || (is_adin2111 && port_idx > 1)) {
@@ -1357,7 +1357,7 @@ int eth_adin2111_sw_reset(const struct device *dev, uint16_t delay)
13571357
static int adin2111_init(const struct device *dev)
13581358
{
13591359
const struct adin2111_config *cfg = dev->config;
1360-
bool is_adin2111 = (cfg->id == ADIN2111_MAC);
1360+
const bool is_adin2111 = (cfg->id == ADIN2111_MAC);
13611361
struct adin2111_data *ctx = dev->data;
13621362
int ret;
13631363
uint32_t val;

0 commit comments

Comments
 (0)