adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

drivers: ethernet: adin2111: minor corrections of is_adin2111

Browse source 
* Make `is_adin2111` a const.
* Check `is_adin2111` before processing port 2 related events.

Signed-off-by: Georgij Cernysiov <geo.cgv@gmail.com>
This commit is contained in:
Georgij Cernysiov 2024-09-30 17:12:46 +02:00 committed by Carles Cufí
parent fd9a947311
commit daf116a73d
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/ethernet/eth_adin2111.c
View file

@ -651,7 +651,7 @@ static void adin2111_offload_thread(void *p1, void *p2, void *p3)
const struct device *dev = p1;
struct adin2111_data *ctx = dev->data;
const struct adin2111_config *adin_cfg = dev->config;
bool is_adin2111 = (adin_cfg->id == ADIN2111_MAC);
const bool is_adin2111 = (adin_cfg->id == ADIN2111_MAC);
uint32_t status0;
uint32_t status1;
int ret;
@ -689,7 +689,7 @@ static void adin2111_offload_thread(void *p1, void *p2, void *p3)
}
/* handle port 2 phy interrupts */
if ((status1 & ADIN2111_STATUS1_PHYINT) && is_adin2111) {
if (is_adin2111 && (status1 & ADIN2111_STATUS1_PHYINT)) {
adin2111_port_on_phyint(ctx->port[1]);
}
@ -700,7 +700,7 @@ static void adin2111_offload_thread(void *p1, void *p2, void *p3)
goto continue_unlock;
}
}
if ((status1 & ADIN2111_STATUS1_P2_RX_RDY ) && is_adin2111) {
if (is_adin2111 && (status1 & ADIN2111_STATUS1_P2_RX_RDY)) {
ret = eth_adin2111_oa_data_read(dev, 1);
if (ret < 0) {
goto continue_unlock;
@ -730,7 +730,7 @@ static void adin2111_offload_thread(void *p1, void *p2, void *p3)
}
/* handle port 2 rx */
if ((status1 & ADIN2111_STATUS1_P2_RX_RDY) && is_adin2111) {
if (is_adin2111 && (status1 & ADIN2111_STATUS1_P2_RX_RDY)) {
do {
ret = adin2111_read_fifo(dev, 1U);
if (ret < 0) {
@ -997,7 +997,7 @@ static int adin2111_write_filter_address(const struct device *dev,
static int adin2111_filter_multicast(const struct device *dev)
{
const struct adin2111_config *cfg = dev->config;
bool is_adin2111 = (cfg->id == ADIN2111_MAC);
const bool is_adin2111 = (cfg->id == ADIN2111_MAC);
uint8_t mm[NET_ETH_ADDR_LEN] = {BIT(0), 0U, 0U, 0U, 0U, 0U};
uint8_t mmask[NET_ETH_ADDR_LEN] = {0xFFU, 0U, 0U, 0U, 0U, 0U};
uint32_t rules = ADIN2111_ADDR_APPLY2PORT1 |
@ -1012,7 +1012,7 @@ static int adin2111_filter_multicast(const struct device *dev)
static int adin2111_filter_broadcast(const struct device *dev)
{
const struct adin2111_config *cfg = dev->config;
bool is_adin2111 = (cfg->id == ADIN2111_MAC);
const bool is_adin2111 = (cfg->id == ADIN2111_MAC);
uint8_t mac[NET_ETH_ADDR_LEN] = {0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU};
uint32_t rules = ADIN2111_ADDR_APPLY2PORT1 |
(is_adin2111 ? ADIN2111_ADDR_APPLY2PORT2 : 0) |
@ -1132,7 +1132,7 @@ static int eth_adin2111_set_promiscuous(const struct device *dev, const uint16_t
bool enable)
{
const struct adin2111_config *cfg = dev->config;
bool is_adin2111 = (cfg->id == ADIN2111_MAC);
const bool is_adin2111 = (cfg->id == ADIN2111_MAC);
uint32_t fwd_mask;
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)
static int adin2111_init(const struct device *dev)
{
const struct adin2111_config *cfg = dev->config;
bool is_adin2111 = (cfg->id == ADIN2111_MAC);
const bool is_adin2111 = (cfg->id == ADIN2111_MAC);
struct adin2111_data *ctx = dev->data;
int ret;
uint32_t val;