On 7/26/2024 6:37 AM, Alexander Lobakin wrote:
>> diff --git a/drivers/net/ethernet/intel/ice/ice_osdep.h
>> b/drivers/net/ethernet/intel/ice/ice_osdep.h
>> index a2562f04267f..c03ab0207e0a 100644
>> --- a/drivers/net/ethernet/intel/ice/ice_osdep.h
>> +++ b/drivers/net/ethernet/intel/ice/ice_osdep.h
>> @@ -23,6 +23,9 @@
>> #define wr64(a, reg, value) writeq((value), ((a)->hw_addr + (reg)))
>> #define rd64(a, reg) readq((a)->hw_addr + (reg))
>>
>> +#define rd32_poll_timeout(a, addr, val, cond, delay_us, timeout_us) \
>> + read_poll_timeout(rd32, val, cond, delay_us, timeout_us, false, a, addr)
>> +
>> #define ice_flush(a) rd32((a), GLGEN_STAT)
>> #define ICE_M(m, s) ((m ## U) << (s))
>>
>> diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c
>> b/drivers/net/ethernet/intel/ice/ice_ptp.c
>> index 9f0eff040a95..ac3944fec2d3 100644
>> --- a/drivers/net/ethernet/intel/ice/ice_ptp.c
>> +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
>> @@ -1,6 +1,7 @@
>> // SPDX-License-Identifier: GPL-2.0
>> /* Copyright (C) 2021, Intel Corporation. */
>>
>> +#include <linux/iopoll.h>
>
> read_poll_timeout() is used in osdep.h, but you include it here.
> You should either define rd32_poll_timeout() here instead of the header
> or move this include to osdep.h.
>
Please move the include to ice_osdep.h, as there are some other places
where we will want to use rd32_poll_timeout (such as in ice_controlq.c,
and others).
Thanks,
Jake