Unverified Commit 2e089ebd authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13117 nebula-matrix: fix ci build err 

Merge Pull Request from: @nebula_matrix 
 
The relevant issue link is https://gitee.com/openeuler/kernel/issues/IB2V0K 
 
Link:https://gitee.com/openeuler/kernel/pulls/13117

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 53b3b043 432279e0

drivers/net/ethernet/nebula-matrix/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config NBL_CORE 
    depends on PCI && VFIO

    depends on ARM64 || X86_64

    default m

    select PLDMFW

    help

      This driver supports Nebula-matrix Ethernet Controller m18110 Family of

      devices.  For more information about this product, go to the product

drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_hwmon.c

+6 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static const struct hwmon_chip_info nbl_hwmon_chip_info = { 


int nbl_dev_setup_hwmon(struct nbl_adapter *adapter)

{

#if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE))

	struct nbl_dev_mgt *dev_mgt = (struct nbl_dev_mgt *)NBL_ADAPTER_TO_DEV_MGT(adapter);

	struct nbl_dev_common *common_dev = NBL_DEV_MGT_TO_COMMON_DEV(dev_mgt);

	struct device *dev = NBL_DEV_MGT_TO_DEV(dev_mgt);
@@ -132,13 +133,18 @@ int nbl_dev_setup_hwmon(struct nbl_adapter *adapter) 
								&nbl_hwmon_chip_info, NULL);



	return PTR_ERR_OR_ZERO(common_dev->hwmon_dev);

#else

	return 0;

#endif

}



void nbl_dev_remove_hwmon(struct nbl_adapter *adapter)

{

#if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE))

	struct nbl_dev_mgt *dev_mgt = (struct nbl_dev_mgt *)NBL_ADAPTER_TO_DEV_MGT(adapter);

	struct nbl_dev_common *common_dev = NBL_DEV_MGT_TO_COMMON_DEV(dev_mgt);



	if (common_dev->hwmon_dev)

		hwmon_device_unregister(common_dev->hwmon_dev);

#endif

}