| Message ID | 20220924023024.14219-6-huangguangbin2@huawei.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | redefine some macros of feature abilities judgement | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/cc_maintainers | success | CCed 5 of 5 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 3 this patch: 3 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 26 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h index 60fda66e08bd..dd2dd085ab3d 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -119,8 +119,8 @@ enum HNAE3_DEV_CAP_BITS { #define hnae3_ae_dev_fd_forward_tc_supported(ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_FD_FORWARD_TC_B, (ae_dev)->caps) -#define hnae3_dev_ptp_supported(hdev) \ - test_bit(HNAE3_DEV_SUPPORT_PTP_B, (hdev)->ae_dev->caps) +#define hnae3_ae_dev_ptp_supported(ae_dev) \ + test_bit(HNAE3_DEV_SUPPORT_PTP_B, (ae_dev)->caps) #define hnae3_dev_int_ql_supported(hdev) \ test_bit(HNAE3_DEV_SUPPORT_INT_QL_B, (hdev)->ae_dev->caps) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c index 66feb23f7b7b..7de1f91c4877 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c @@ -1367,7 +1367,7 @@ int hns3_dbg_init(struct hnae3_handle *handle) if ((hns3_dbg_cmd[i].cmd == HNAE3_DBG_CMD_TM_NODES && ae_dev->dev_version <= HNAE3_DEVICE_VERSION_V2) || (hns3_dbg_cmd[i].cmd == HNAE3_DBG_CMD_PTP_INFO && - !test_bit(HNAE3_DEV_SUPPORT_PTP_B, ae_dev->caps))) + !hnae3_ae_dev_ptp_supported(ae_dev))) continue; if (!hns3_dbg_cmd[i].init) { diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c index a40b1583f114..aebd98586e62 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c @@ -486,7 +486,7 @@ int hclge_ptp_init(struct hclge_dev *hdev) struct timespec64 ts; int ret; - if (!test_bit(HNAE3_DEV_SUPPORT_PTP_B, ae_dev->caps)) + if (!hnae3_ae_dev_ptp_supported(ae_dev)) return 0; if (!hdev->ptp) {
Redefine macro hnae3_dev_ptp_supported(hdev) to hnae3_ae_dev_ptp_supported(ae_dev), so it can be used in both hclge and hns3_enet layer. Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com> --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 ++-- drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)