Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1325493 > unrolled thread

[PATCH] drm/msm/dsi: fix definition of msm_dsi_pll_28nm_8960_init()

Back to article view | Back to linux.kernel

Contents

  [PATCH] drm/msm/dsi: fix definition of msm_dsi_pll_28nm_8960_init() Luis Henriques <luis.henriques@canonical.com> - 2016-02-03 15:30 +0100
    Re: [PATCH] drm/msm/dsi: fix definition of  msm_dsi_pll_28nm_8960_init() Archit Taneja <architt@codeaurora.org> - 2016-02-04 06:10 +0100

#1325493 — [PATCH] drm/msm/dsi: fix definition of msm_dsi_pll_28nm_8960_init()

This fixes the following build failure:

drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o: In function `msm_dsi_pll_28nm_8960_init':
dsi_pll_28nm.c:(.text+0x1198): multiple definition of `msm_dsi_pll_28nm_8960_init'
drivers/gpu/drm/msm/dsi/pll/dsi_pll.o:dsi_pll.c:(.text+0x0): first defined here

Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
index 80b6038334a6..2cf1664723e8 100644
--- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
+++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
@@ -97,8 +97,8 @@ static inline struct msm_dsi_pll *msm_dsi_pll_28nm_init(
 struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev,
 					       int id);
 #else
-struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev,
-					       int id)
+static inline struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(
+	struct platform_device *pdev, int id)
 {
 	return ERR_PTR(-ENODEV);
 }

[toc] | [next] | [standalone]

#1326401 — Re: [PATCH] drm/msm/dsi: fix definition of msm_dsi_pll_28nm_8960_init()

On 02/03/2016 07:55 PM, Luis Henriques wrote:
> This fixes the following build failure:
>
> drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o: In function `msm_dsi_pll_28nm_8960_init':
> dsi_pll_28nm.c:(.text+0x1198): multiple definition of `msm_dsi_pll_28nm_8960_init'
> drivers/gpu/drm/msm/dsi/pll/dsi_pll.o:dsi_pll.c:(.text+0x0): first defined here

Thanks for the fix.

Acked-by: Archit Taneja <architt@codeaurora.org>

Dave,

Could you please queue this for the next -rc cycle since it causes a
build break?

Thanks,
Archit

>
> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
> ---
>   drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
> index 80b6038334a6..2cf1664723e8 100644
> --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
> +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
> @@ -97,8 +97,8 @@ static inline struct msm_dsi_pll *msm_dsi_pll_28nm_init(
>   struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev,
>   					       int id);
>   #else
> -struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev,
> -					       int id)
> +static inline struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(
> +	struct platform_device *pdev, int id)
>   {
>   	return ERR_PTR(-ENODEV);
>   }
>

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora 
Forum, hosted by The Linux Foundation

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web