[PATCH] serial: samsung: Fix build for non-Exynos4210 devices

[PATCH] serial: samsung: Fix build for non-Exynos4210 devices

[Mark Brown]

exynos4120_serial_drv_data is only defined when building with support
for Exynos4210 so use the already provided define to ensure that we
don't reference it when building for other SoCs.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/tty/serial/samsung.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index efe3756..7272eee 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1649,7 +1649,7 @@ MODULE_DEVICE_TABLE(platform, s3c24xx_serial_driver_ids);
 #ifdef CONFIG_OF
 static const struct of_device_id s3c24xx_uart_dt_match[] = {
 	{ .compatible = "samsung,exynos4210-uart",
-		.data = &exynos4210_serial_drv_data },
+		.data = EXYNOS4210_SERIAL_DRV_DATA },
 	{},
 };
 MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match);
-- 
1.7.7.1

Re: [PATCH] serial: samsung: Fix build for non-Exynos4210 devices

[Thomas Abraham]

Hi Mark,

On 4 November 2011 22:46, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> exynos4120_serial_drv_data is only defined when building with support
> for Exynos4210 so use the already provided define to ensure that we
> don't reference it when building for other SoCs.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

I missed that one. Thanks for the fix.

The Samsung device tree patches will not be merged in v3.2 merge
window. So should this fix be merged into the uart dt support patch or
should this be a separate patch?

Thanks,
Thomas.

> ---
>  drivers/tty/serial/samsung.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
> index efe3756..7272eee 100644
> --- a/drivers/tty/serial/samsung.c
> +++ b/drivers/tty/serial/samsung.c
> @@ -1649,7 +1649,7 @@ MODULE_DEVICE_TABLE(platform, s3c24xx_serial_driver_ids);
>  #ifdef CONFIG_OF
>  static const struct of_device_id s3c24xx_uart_dt_match[] = {
>        { .compatible = "samsung,exynos4210-uart",
> -               .data = &exynos4210_serial_drv_data },
> +               .data = EXYNOS4210_SERIAL_DRV_DATA },
>        {},
>  };
>  MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match);
> --
> 1.7.7.1
>
>

RE: [PATCH] serial: samsung: Fix build for non-Exynos4210 devices

[Kukjin Kim]

Thomas Abraham wrote:
> 
> Hi Mark,
> 
> On 4 November 2011 22:46, Mark Brown
> <broonie@opensource.wolfsonmicro.com> wrote:
> > exynos4120_serial_drv_data is only defined when building with support
> > for Exynos4210 so use the already provided define to ensure that we
> > don't reference it when building for other SoCs.
> >
> > Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> 
> I missed that one. Thanks for the fix.
> 
> The Samsung device tree patches will not be merged in v3.2 merge
> window. So should this fix be merged into the uart dt support patch or
> should this be a separate patch?
> 

Hi all,

Okay, I will pick this up on 'next-samung-dt' tree which will be sent to
upstream in next time.

As a note, I need to sort out the tree based on v3.2-rc1 then will apply
this.

If any problems, please let me know.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> 
> > ---
> >  drivers/tty/serial/samsung.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
> > index efe3756..7272eee 100644
> > --- a/drivers/tty/serial/samsung.c
> > +++ b/drivers/tty/serial/samsung.c
> > @@ -1649,7 +1649,7 @@ MODULE_DEVICE_TABLE(platform,
> s3c24xx_serial_driver_ids);
> >  #ifdef CONFIG_OF
> >  static const struct of_device_id s3c24xx_uart_dt_match[] = {
> >        { .compatible = "samsung,exynos4210-uart",
> > -               .data = &exynos4210_serial_drv_data },
> > +               .data = EXYNOS4210_SERIAL_DRV_DATA },
> >        {},
> >  };
> >  MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match);
> > --
> > 1.7.7.1
> >
> >

--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html