These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / misc / ti-st / st_ll.c

diff --git a/kernel/drivers/misc/ti-st/st_ll.c b/kernel/drivers/misc/ti-st/st_ll.c
index 518e1b7..93b4d67 100644 (file)
--- a/kernel/drivers/misc/ti-st/st_ll.c
+++ b/kernel/drivers/misc/ti-st/st_ll.c
@@ -26,7 +26,6 @@
 #include <linux/ti_wilink_st.h>
 
 /**********************************************************************/
-
 /* internal functions */
 static void send_ll_cmd(struct st_data_s *st_data,
        unsigned char cmd)
@@ -54,13 +53,7 @@ static void ll_device_want_to_sleep(struct st_data_s *st_data)
 
        /* communicate to platform about chip asleep */
        kim_data = st_data->kim_data;
-       if (kim_data->kim_pdev->dev.of_node) {
-               pr_debug("use device tree data");
-               pdata = dt_pdata;
-       } else {
-               pdata = kim_data->kim_pdev->dev.platform_data;
-       }
-
+       pdata = kim_data->kim_pdev->dev.platform_data;
        if (pdata->chip_asleep)
                pdata->chip_asleep(NULL);
 }
@@ -93,13 +86,7 @@ static void ll_device_want_to_wakeup(struct st_data_s *st_data)
 
        /* communicate to platform about chip wakeup */
        kim_data = st_data->kim_data;
-       if (kim_data->kim_pdev->dev.of_node) {
-               pr_debug("use device tree data");
-               pdata = dt_pdata;
-       } else {
-               pdata = kim_data->kim_pdev->dev.platform_data;
-       }
-
+       pdata = kim_data->kim_pdev->dev.platform_data;
        if (pdata->chip_awake)
                pdata->chip_awake(NULL);
 }