tty: serial: samsung: simplify getting OF match data
authorKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Tue, 8 Mar 2022 08:09:19 +0000 (09:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Mar 2022 12:24:28 +0000 (13:24 +0100)
Simplify the code with of_device_get_match_data() and use dev_of_node()
to remove ifdef-erry.

Tested-by: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Link: https://lore.kernel.org/r/20220308080919.152715-9-krzysztof.kozlowski@canonical.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/samsung_tty.c

index f466c8f8adcca401b86b4a7071cb8de144c54ef6..5affd7e707bdb20bfe562ec58571f0a1106b015f 100644 (file)
@@ -2147,23 +2147,14 @@ err:
 
 /* Device driver serial port probe */
 
-#ifdef CONFIG_OF
-static const struct of_device_id s3c24xx_uart_dt_match[];
-#endif
-
 static int probe_index;
 
 static inline const struct s3c24xx_serial_drv_data *
 s3c24xx_get_driver_data(struct platform_device *pdev)
 {
-#ifdef CONFIG_OF
-       if (pdev->dev.of_node) {
-               const struct of_device_id *match;
+       if (dev_of_node(&pdev->dev))
+               return of_device_get_match_data(&pdev->dev);
 
-               match = of_match_node(s3c24xx_uart_dt_match, pdev->dev.of_node);
-               return (struct s3c24xx_serial_drv_data *)match->data;
-       }
-#endif
        return (struct s3c24xx_serial_drv_data *)
                        platform_get_device_id(pdev)->driver_data;
 }