diff options
| author | Yin, Fengwei <fengwei.yin@linaro.org> | 2015-10-23 16:07:42 +0800 |
|---|---|---|
| committer | Yin, Fengwei <fengwei.yin@linaro.org> | 2015-10-23 16:07:42 +0800 |
| commit | fd082ccc652a01f5c8e82f434dcbd3f579fa09ce (patch) | |
| tree | 3438c073c9f24a8ad98e84eea16b226f7d952691 | |
| parent | adb552ae3f05004cbd47b3dd9f2d6498a30acc55 (diff) | |
wcn36xx: Update the smd client driver to use new smd channel
match method.
Signed-off-by: Yin, Fengwei <fengwei.yin@linaro.org>
| -rw-r--r-- | drivers/net/wireless/ath/wcn36xx/wcn36xx-msm.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/wcn36xx/wcnss_core.c | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx-msm.c b/drivers/net/wireless/ath/wcn36xx/wcn36xx-msm.c index 647cf026d37c..00cc658b8eee 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx-msm.c +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx-msm.c @@ -154,20 +154,19 @@ static int qcom_smd_wlan_ctrl_callback(struct qcom_smd_device *qsdev, return 0; } -static const struct of_device_id qcom_smd_wlan_ctrl_of_match[] = { - { .compatible = "qcom,wlan-ctrl" }, +static const struct qcom_smd_id qcom_smd_wlan_ctrl_match[] = { + { .name = "WLAN_CTRL" }, {} }; -MODULE_DEVICE_TABLE(of, qcom_smd_wlan_ctrl_of_match); static struct qcom_smd_driver qcom_smd_wlan_ctrl_driver = { .probe = qcom_smd_wlan_ctrl_probe, .remove = qcom_smd_wlan_ctrl_remove, .callback = qcom_smd_wlan_ctrl_callback, + .smd_match_table = qcom_smd_wlan_ctrl_match, .driver = { .name = "qcom_smd_wlan_ctrl", .owner = THIS_MODULE, - .of_match_table = qcom_smd_wlan_ctrl_of_match, }, }; diff --git a/drivers/net/wireless/ath/wcn36xx/wcnss_core.c b/drivers/net/wireless/ath/wcn36xx/wcnss_core.c index 645968b39116..e7d389e87886 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcnss_core.c +++ b/drivers/net/wireless/ath/wcn36xx/wcnss_core.c @@ -256,20 +256,19 @@ static void qcom_smd_wcnss_ctrl_remove(struct qcom_smd_device *sdev) of_platform_depopulate(&sdev->dev); } -static const struct of_device_id qcom_smd_wcnss_ctrl_of_match[] = { - { .compatible = "qcom,wcnss-ctrl" }, +static const struct qcom_smd_id qcom_smd_wcnss_ctrl_match[] = { + { .name = "WCNSS_CTRL" }, {} }; -MODULE_DEVICE_TABLE(of, qcom_smd_wcnss_ctrl_of_match); static struct qcom_smd_driver qcom_smd_wcnss_ctrl_driver = { .probe = qcom_smd_wcnss_ctrl_probe, .remove = qcom_smd_wcnss_ctrl_remove, .callback = qcom_smd_wcnss_ctrl_callback, + .smd_match_table = qcom_smd_wcnss_ctrl_match, .driver = { .name = "qcom_smd_wcnss_ctrl", .owner = THIS_MODULE, - .of_match_table = qcom_smd_wcnss_ctrl_of_match, }, }; |