The different subsystems implementing the QMI service protocol are using their own definition of the service id. It is not a problem but it results on having those duplicated with different names but the same value and without consistency in their name.
The QMI service IDs are defined in the qmi.h header file. Use those instead of defining the IDs in the protocol implementation file. It will result in unifying and providing a consistent way to represent the supported protocols. This series is based on the immutable branch [1] containing the QMI service id definitions along with some drivers using them. How a patch can be merged ? * Add the Ack tag and let it go through the QCom's tree OR * Apply the patch on top of the immutable branch [1] [1] https://lore.kernel.org/all/abdkE2qWX5Amf5Jo@baldur/ Changelog: v2: * Added Reviewed-by tags * Removed patches picked up by Bjorn * Rebase on top of the immutable branch from QCom's tree * Fixed up short description prefix for wifi changes v1: * Initial post Cc: Alex Elder <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Eric Dumazet <[email protected]> Cc: Jakub Kicinski <[email protected]> Cc: Paolo Abeni <[email protected]> Cc: Jeff Johnson <[email protected]> Cc: Bjorn Andersson <[email protected]> Cc: Mathieu Poirier <[email protected]> Cc: Srinivas Kandagatla <[email protected]> Cc: Konrad Dybcio <[email protected]> Cc: Jaroslav Kysela <[email protected]> Cc: Takashi Iwai <[email protected]> Cc: Kees Cook <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Mark Brown <[email protected]> Cc: Wesley Cheng <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] --- Daniel Lezcano (4): net: ipa: Use the unified QMI service ID instead of defining it locally wifi: ath: Use the unified QMI service ID instead of defining it locally slimbus: qcom-ngd-ctrl: Use the unified QMI service ID instead of defining it locally ALSA: usb-audio: qcom: Use the unified QMI service ID instead of defining it locally drivers/net/ipa/ipa_qmi.c | 6 ++---- drivers/net/wireless/ath/ath10k/qmi.c | 2 +- drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h | 1 - drivers/net/wireless/ath/ath11k/qmi.c | 2 +- drivers/net/wireless/ath/ath11k/qmi.h | 1 - drivers/net/wireless/ath/ath12k/qmi.c | 2 +- drivers/net/wireless/ath/ath12k/qmi.h | 1 - drivers/slimbus/qcom-ngd-ctrl.c | 5 ++--- sound/usb/qcom/qc_audio_offload.c | 2 +- sound/usb/qcom/usb_audio_qmi_v01.h | 1 - 10 files changed, 8 insertions(+), 15 deletions(-) -- 2.43.0
