wifi: iwlwifi: handle NULL/ERR returns from ptp_clock_register()

ptp_clock_register() returns NULL when PTP support is disabled and may
return an ERR_PTR() on other failures. Reduce Log severity for NULL
return cases to avoid misleading errors when PTP is unavailable.

Signed-off-by: Avinash Bhatt <avinash.bhatt@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20260321192637.adea594600e8.I0e3d3f7ce897c54fff8ace6dd0faf55b4f39832b@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/ptp.c b/drivers/net/wireless/intel/iwlwifi/mld/ptp.c
index 231920425c066ec53c01030885f1c9e8d03e69f2..c65f4b56a3270f61533210a867da17d08a609440 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/ptp.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/ptp.c
@@ -301,10 +301,12 @@ void iwl_mld_ptp_init(struct iwl_mld *mld)
        mld->ptp_data.ptp_clock =
                ptp_clock_register(&mld->ptp_data.ptp_clock_info, mld->dev);
 
-       if (IS_ERR_OR_NULL(mld->ptp_data.ptp_clock)) {
+       if (IS_ERR(mld->ptp_data.ptp_clock)) {
                IWL_ERR(mld, "Failed to register PHC clock (%ld)\n",
                        PTR_ERR(mld->ptp_data.ptp_clock));
                mld->ptp_data.ptp_clock = NULL;
+       } else if (!mld->ptp_data.ptp_clock) {
+               IWL_DEBUG_INFO(mld, "PTP module unavailable on this kernel\n");
        } else {
                IWL_DEBUG_INFO(mld, "Registered PHC clock: %s, with index: %d\n",
                               mld->ptp_data.ptp_clock_info.name,

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c b/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c
index ad156b82eaa943fdb7c1cb00068e6bdcb2cbc8c6..f7b620136c8576a21ed4b7b7f8797e65afe27623 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c
@@ -304,7 +304,9 @@ void iwl_mvm_ptp_init(struct iwl_mvm *mvm)
                IWL_ERR(mvm, "Failed to register PHC clock (%ld)\n",
                        PTR_ERR(mvm->ptp_data.ptp_clock));
                mvm->ptp_data.ptp_clock = NULL;
-       } else if (mvm->ptp_data.ptp_clock) {
+       } else if (!mvm->ptp_data.ptp_clock) {
+               IWL_DEBUG_INFO(mvm, "PTP module unavailable on this kernel\n");
+       } else {
                IWL_DEBUG_INFO(mvm, "Registered PHC clock: %s, with index: %d\n",
                               mvm->ptp_data.ptp_clock_info.name,
                               ptp_clock_index(mvm->ptp_data.ptp_clock));