net: hisilicon: hns: Remove reset helpers

With hns_dsaf_roce_reset() removed in a previous patch, the two
helper member pointers, 'hns_dsaf_roce_srst',  and 'hns_dsaf_srst_chns'
are now unread.

Remove them, and the helper functions that they were initialised
to, that is hns_dsaf_srst_chns(), hns_dsaf_srst_chns_acpi(),
hns_dsaf_roce_srst() and hns_dsaf_roce_srst_acpi().

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Jijie Shao<shaojijie@huawei.com>
Link: https://patch.msgid.link/20241218163341.40297-4-linux@treblig.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
index c90f41c75500d1ff890b86b2c295a74047a5a371..bb8267aafc43432a032007c05a7812789ebc3c63 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
@@ -307,9 +307,6 @@ struct dsaf_misc_op {
        void (*ge_srst)(struct dsaf_device *dsaf_dev, u32 port, bool dereset);
        void (*ppe_srst)(struct dsaf_device *dsaf_dev, u32 port, bool dereset);
        void (*ppe_comm_srst)(struct dsaf_device *dsaf_dev, bool dereset);
-       void (*hns_dsaf_srst_chns)(struct dsaf_device *dsaf_dev, u32 msk,
-                                  bool dereset);
-       void (*hns_dsaf_roce_srst)(struct dsaf_device *dsaf_dev, bool dereset);
 
        phy_interface_t (*get_phy_if)(struct hns_mac_cb *mac_cb);
        int (*get_sfp_prsnt)(struct hns_mac_cb *mac_cb, int *sfp_prsnt);

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
index 5df19c604d09aa86a9b79b6a1d221c9367b383d8..91391a49fcea27ca9322fc725d484f1b553dc488 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
@@ -326,69 +326,6 @@ static void hns_dsaf_xge_srst_by_port_acpi(struct dsaf_device *dsaf_dev,
                                   HNS_XGE_RESET_FUNC, port, dereset);
 }
 
-/**
- * hns_dsaf_srst_chns - reset dsaf channels
- * @dsaf_dev: dsaf device struct pointer
- * @msk: xbar channels mask value:
- * @dereset: false - request reset , true - drop reset
- *
- * bit0-5 for xge0-5
- * bit6-11 for ppe0-5
- * bit12-17 for roce0-5
- * bit18-19 for com/dfx
- */
-static void
-hns_dsaf_srst_chns(struct dsaf_device *dsaf_dev, u32 msk, bool dereset)
-{
-       u32 reg_addr;
-
-       if (!dereset)
-               reg_addr = DSAF_SUB_SC_DSAF_RESET_REQ_REG;
-       else
-               reg_addr = DSAF_SUB_SC_DSAF_RESET_DREQ_REG;
-
-       dsaf_write_sub(dsaf_dev, reg_addr, msk);
-}
-
-/**
- * hns_dsaf_srst_chns_acpi - reset dsaf channels
- * @dsaf_dev: dsaf device struct pointer
- * @msk: xbar channels mask value:
- * @dereset: false - request reset , true - drop reset
- *
- * bit0-5 for xge0-5
- * bit6-11 for ppe0-5
- * bit12-17 for roce0-5
- * bit18-19 for com/dfx
- */
-static void
-hns_dsaf_srst_chns_acpi(struct dsaf_device *dsaf_dev, u32 msk, bool dereset)
-{
-       hns_dsaf_acpi_srst_by_port(dsaf_dev, HNS_OP_RESET_FUNC,
-                                  HNS_DSAF_CHN_RESET_FUNC,
-                                  msk, dereset);
-}
-
-static void hns_dsaf_roce_srst(struct dsaf_device *dsaf_dev, bool dereset)
-{
-       if (!dereset) {
-               dsaf_write_sub(dsaf_dev, DSAF_SUB_SC_ROCEE_RESET_REQ_REG, 1);
-       } else {
-               dsaf_write_sub(dsaf_dev,
-                              DSAF_SUB_SC_ROCEE_CLK_DIS_REG, 1);
-               dsaf_write_sub(dsaf_dev,
-                              DSAF_SUB_SC_ROCEE_RESET_DREQ_REG, 1);
-               msleep(20);
-               dsaf_write_sub(dsaf_dev, DSAF_SUB_SC_ROCEE_CLK_EN_REG, 1);
-       }
-}
-
-static void hns_dsaf_roce_srst_acpi(struct dsaf_device *dsaf_dev, bool dereset)
-{
-       hns_dsaf_acpi_srst_by_port(dsaf_dev, HNS_OP_RESET_FUNC,
-                                  HNS_ROCE_RESET_FUNC, 0, dereset);
-}
-
 static void hns_dsaf_ge_srst_by_port(struct dsaf_device *dsaf_dev, u32 port,
                                     bool dereset)
 {
@@ -729,8 +666,6 @@ struct dsaf_misc_op *hns_misc_op_get(struct dsaf_device *dsaf_dev)
                misc_op->ge_srst = hns_dsaf_ge_srst_by_port;
                misc_op->ppe_srst = hns_ppe_srst_by_port;
                misc_op->ppe_comm_srst = hns_ppe_com_srst;
-               misc_op->hns_dsaf_srst_chns = hns_dsaf_srst_chns;
-               misc_op->hns_dsaf_roce_srst = hns_dsaf_roce_srst;
 
                misc_op->get_phy_if = hns_mac_get_phy_if;
                misc_op->get_sfp_prsnt = hns_mac_get_sfp_prsnt;
@@ -746,8 +681,6 @@ struct dsaf_misc_op *hns_misc_op_get(struct dsaf_device *dsaf_dev)
                misc_op->ge_srst = hns_dsaf_ge_srst_by_port_acpi;
                misc_op->ppe_srst = hns_ppe_srst_by_port_acpi;
                misc_op->ppe_comm_srst = hns_ppe_com_srst;
-               misc_op->hns_dsaf_srst_chns = hns_dsaf_srst_chns_acpi;
-               misc_op->hns_dsaf_roce_srst = hns_dsaf_roce_srst_acpi;
 
                misc_op->get_phy_if = hns_mac_get_phy_if_acpi;
                misc_op->get_sfp_prsnt = hns_mac_get_sfp_prsnt_acpi;