Skip to content

Commit 3aec400

Browse files
krzkgregkh
krzk
authored and
gregkh
committed
tty: serial: samsung: reduce number of casts
The pointers to instances of "struct s3c24xx_serial_drv_data" are first cast to kernel_ulong_t and then either used directly (in "platform_device_id.driver_data") or cast again to void * (in "of_device_id.data"). One cast can be dropped, so at least for "of_device_id.data" case there will be no casts at all. This makes the code a bit simpler. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Link: https://lore.kernel.org/r/20220308080919.152715-4-krzysztof.kozlowski@canonical.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7483189 commit 3aec400

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

‎drivers/tty/serial/samsung_tty.c

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2634,9 +2634,9 @@ static struct s3c24xx_serial_drv_data s3c2410_serial_drv_data = {
26342634
.ufcon = S3C2410_UFCON_DEFAULT,
26352635
},
26362636
};
2637-
#define S3C2410_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2410_serial_drv_data)
2637+
#define S3C2410_SERIAL_DRV_DATA (&s3c2410_serial_drv_data)
26382638
#else
2639-
#define S3C2410_SERIAL_DRV_DATA (kernel_ulong_t)NULL
2639+
#define S3C2410_SERIAL_DRV_DATA NULL
26402640
#endif
26412641

26422642
#ifdef CONFIG_CPU_S3C2412
@@ -2663,9 +2663,9 @@ static struct s3c24xx_serial_drv_data s3c2412_serial_drv_data = {
26632663
.ufcon = S3C2410_UFCON_DEFAULT,
26642664
},
26652665
};
2666-
#define S3C2412_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2412_serial_drv_data)
2666+
#define S3C2412_SERIAL_DRV_DATA (&s3c2412_serial_drv_data)
26672667
#else
2668-
#define S3C2412_SERIAL_DRV_DATA (kernel_ulong_t)NULL
2668+
#define S3C2412_SERIAL_DRV_DATA NULL
26692669
#endif
26702670

26712671
#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2416) || \
@@ -2694,9 +2694,9 @@ static struct s3c24xx_serial_drv_data s3c2440_serial_drv_data = {
26942694
.ufcon = S3C2410_UFCON_DEFAULT,
26952695
},
26962696
};
2697-
#define S3C2440_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2440_serial_drv_data)
2697+
#define S3C2440_SERIAL_DRV_DATA (&s3c2440_serial_drv_data)
26982698
#else
2699-
#define S3C2440_SERIAL_DRV_DATA (kernel_ulong_t)NULL
2699+
#define S3C2440_SERIAL_DRV_DATA NULL
27002700
#endif
27012701

27022702
#if defined(CONFIG_CPU_S3C6400) || defined(CONFIG_CPU_S3C6410)
@@ -2723,9 +2723,9 @@ static struct s3c24xx_serial_drv_data s3c6400_serial_drv_data = {
27232723
.ufcon = S3C2410_UFCON_DEFAULT,
27242724
},
27252725
};
2726-
#define S3C6400_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c6400_serial_drv_data)
2726+
#define S3C6400_SERIAL_DRV_DATA (&s3c6400_serial_drv_data)
27272727
#else
2728-
#define S3C6400_SERIAL_DRV_DATA (kernel_ulong_t)NULL
2728+
#define S3C6400_SERIAL_DRV_DATA NULL
27292729
#endif
27302730

27312731
#ifdef CONFIG_CPU_S5PV210
@@ -2752,9 +2752,9 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data = {
27522752
},
27532753
.fifosize = { 256, 64, 16, 16 },
27542754
};
2755-
#define S5PV210_SERIAL_DRV_DATA ((kernel_ulong_t)&s5pv210_serial_drv_data)
2755+
#define S5PV210_SERIAL_DRV_DATA (&s5pv210_serial_drv_data)
27562756
#else
2757-
#define S5PV210_SERIAL_DRV_DATA (kernel_ulong_t)NULL
2757+
#define S5PV210_SERIAL_DRV_DATA NULL
27582758
#endif
27592759

27602760
#if defined(CONFIG_ARCH_EXYNOS)
@@ -2796,14 +2796,14 @@ static struct s3c24xx_serial_drv_data exynos850_serial_drv_data = {
27962796
.fifosize = { 256, 64, 64, 64 },
27972797
};
27982798

2799-
#define EXYNOS4210_SERIAL_DRV_DATA ((kernel_ulong_t)&exynos4210_serial_drv_data)
2800-
#define EXYNOS5433_SERIAL_DRV_DATA ((kernel_ulong_t)&exynos5433_serial_drv_data)
2801-
#define EXYNOS850_SERIAL_DRV_DATA ((kernel_ulong_t)&exynos850_serial_drv_data)
2799+
#define EXYNOS4210_SERIAL_DRV_DATA (&exynos4210_serial_drv_data)
2800+
#define EXYNOS5433_SERIAL_DRV_DATA (&exynos5433_serial_drv_data)
2801+
#define EXYNOS850_SERIAL_DRV_DATA (&exynos850_serial_drv_data)
28022802

28032803
#else
2804-
#define EXYNOS4210_SERIAL_DRV_DATA ((kernel_ulong_t)NULL)
2805-
#define EXYNOS5433_SERIAL_DRV_DATA ((kernel_ulong_t)NULL)
2806-
#define EXYNOS850_SERIAL_DRV_DATA ((kernel_ulong_t)NULL)
2804+
#define EXYNOS4210_SERIAL_DRV_DATA NULL
2805+
#define EXYNOS5433_SERIAL_DRV_DATA NULL
2806+
#define EXYNOS850_SERIAL_DRV_DATA NULL
28072807
#endif
28082808

28092809
#ifdef CONFIG_ARCH_APPLE
@@ -2829,39 +2829,39 @@ static struct s3c24xx_serial_drv_data s5l_serial_drv_data = {
28292829
.ufcon = S3C2410_UFCON_DEFAULT,
28302830
},
28312831
};
2832-
#define S5L_SERIAL_DRV_DATA ((kernel_ulong_t)&s5l_serial_drv_data)
2832+
#define S5L_SERIAL_DRV_DATA (&s5l_serial_drv_data)
28332833
#else
2834-
#define S5L_SERIAL_DRV_DATA ((kernel_ulong_t)NULL)
2834+
#define S5L_SERIAL_DRV_DATA NULL
28352835
#endif
28362836

28372837
static const struct platform_device_id s3c24xx_serial_driver_ids[] = {
28382838
{
28392839
.name = "s3c2410-uart",
2840-
.driver_data = S3C2410_SERIAL_DRV_DATA,
2840+
.driver_data = (kernel_ulong_t)S3C2410_SERIAL_DRV_DATA,
28412841
}, {
28422842
.name = "s3c2412-uart",
2843-
.driver_data = S3C2412_SERIAL_DRV_DATA,
2843+
.driver_data = (kernel_ulong_t)S3C2412_SERIAL_DRV_DATA,
28442844
}, {
28452845
.name = "s3c2440-uart",
2846-
.driver_data = S3C2440_SERIAL_DRV_DATA,
2846+
.driver_data = (kernel_ulong_t)S3C2440_SERIAL_DRV_DATA,
28472847
}, {
28482848
.name = "s3c6400-uart",
2849-
.driver_data = S3C6400_SERIAL_DRV_DATA,
2849+
.driver_data = (kernel_ulong_t)S3C6400_SERIAL_DRV_DATA,
28502850
}, {
28512851
.name = "s5pv210-uart",
2852-
.driver_data = S5PV210_SERIAL_DRV_DATA,
2852+
.driver_data = (kernel_ulong_t)S5PV210_SERIAL_DRV_DATA,
28532853
}, {
28542854
.name = "exynos4210-uart",
2855-
.driver_data = EXYNOS4210_SERIAL_DRV_DATA,
2855+
.driver_data = (kernel_ulong_t)EXYNOS4210_SERIAL_DRV_DATA,
28562856
}, {
28572857
.name = "exynos5433-uart",
2858-
.driver_data = EXYNOS5433_SERIAL_DRV_DATA,
2858+
.driver_data = (kernel_ulong_t)EXYNOS5433_SERIAL_DRV_DATA,
28592859
}, {
28602860
.name = "s5l-uart",
2861-
.driver_data = S5L_SERIAL_DRV_DATA,
2861+
.driver_data = (kernel_ulong_t)S5L_SERIAL_DRV_DATA,
28622862
}, {
28632863
.name = "exynos850-uart",
2864-
.driver_data = EXYNOS850_SERIAL_DRV_DATA,
2864+
.driver_data = (kernel_ulong_t)EXYNOS850_SERIAL_DRV_DATA,
28652865
},
28662866
{ },
28672867
};
@@ -2870,23 +2870,23 @@ MODULE_DEVICE_TABLE(platform, s3c24xx_serial_driver_ids);
28702870
#ifdef CONFIG_OF
28712871
static const struct of_device_id s3c24xx_uart_dt_match[] = {
28722872
{ .compatible = "samsung,s3c2410-uart",
2873-
.data = (void *)S3C2410_SERIAL_DRV_DATA },
2873+
.data = S3C2410_SERIAL_DRV_DATA },
28742874
{ .compatible = "samsung,s3c2412-uart",
2875-
.data = (void *)S3C2412_SERIAL_DRV_DATA },
2875+
.data = S3C2412_SERIAL_DRV_DATA },
28762876
{ .compatible = "samsung,s3c2440-uart",
2877-
.data = (void *)S3C2440_SERIAL_DRV_DATA },
2877+
.data = S3C2440_SERIAL_DRV_DATA },
28782878
{ .compatible = "samsung,s3c6400-uart",
2879-
.data = (void *)S3C6400_SERIAL_DRV_DATA },
2879+
.data = S3C6400_SERIAL_DRV_DATA },
28802880
{ .compatible = "samsung,s5pv210-uart",
2881-
.data = (void *)S5PV210_SERIAL_DRV_DATA },
2881+
.data = S5PV210_SERIAL_DRV_DATA },
28822882
{ .compatible = "samsung,exynos4210-uart",
2883-
.data = (void *)EXYNOS4210_SERIAL_DRV_DATA },
2883+
.data = EXYNOS4210_SERIAL_DRV_DATA },
28842884
{ .compatible = "samsung,exynos5433-uart",
2885-
.data = (void *)EXYNOS5433_SERIAL_DRV_DATA },
2885+
.data = EXYNOS5433_SERIAL_DRV_DATA },
28862886
{ .compatible = "apple,s5l-uart",
2887-
.data = (void *)S5L_SERIAL_DRV_DATA },
2887+
.data = S5L_SERIAL_DRV_DATA },
28882888
{ .compatible = "samsung,exynos850-uart",
2889-
.data = (void *)EXYNOS850_SERIAL_DRV_DATA },
2889+
.data = EXYNOS850_SERIAL_DRV_DATA },
28902890
{},
28912891
};
28922892
MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match);

0 commit comments

Comments
 (0)