From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: Re: [PATCH] drm/msm/dsi: fix definition of msm_dsi_pll_28nm_8960_init() Date: Thu, 4 Feb 2016 10:39:25 +0530 Message-ID: <56B2DD05.1070405@codeaurora.org> References: <1454509515-2365-1-git-send-email-luis.henriques@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id 818266E43E for ; Wed, 3 Feb 2016 21:09:33 -0800 (PST) In-Reply-To: <1454509515-2365-1-git-send-email-luis.henriques@canonical.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Luis Henriques , David Airlie , Rob Clark Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org CgpPbiAwMi8wMy8yMDE2IDA3OjU1IFBNLCBMdWlzIEhlbnJpcXVlcyB3cm90ZToKPiBUaGlzIGZp eGVzIHRoZSBmb2xsb3dpbmcgYnVpbGQgZmFpbHVyZToKPgo+IGRyaXZlcnMvZ3B1L2RybS9tc20v ZHNpL3BsbC9kc2lfcGxsXzI4bm0ubzogSW4gZnVuY3Rpb24gYG1zbV9kc2lfcGxsXzI4bm1fODk2 MF9pbml0JzoKPiBkc2lfcGxsXzI4bm0uYzooLnRleHQrMHgxMTk4KTogbXVsdGlwbGUgZGVmaW5p dGlvbiBvZiBgbXNtX2RzaV9wbGxfMjhubV84OTYwX2luaXQnCj4gZHJpdmVycy9ncHUvZHJtL21z bS9kc2kvcGxsL2RzaV9wbGwubzpkc2lfcGxsLmM6KC50ZXh0KzB4MCk6IGZpcnN0IGRlZmluZWQg aGVyZQoKVGhhbmtzIGZvciB0aGUgZml4LgoKQWNrZWQtYnk6IEFyY2hpdCBUYW5lamEgPGFyY2hp dHRAY29kZWF1cm9yYS5vcmc+CgpEYXZlLAoKQ291bGQgeW91IHBsZWFzZSBxdWV1ZSB0aGlzIGZv ciB0aGUgbmV4dCAtcmMgY3ljbGUgc2luY2UgaXQgY2F1c2VzIGEKYnVpbGQgYnJlYWs/CgpUaGFu a3MsCkFyY2hpdAoKPgo+IFNpZ25lZC1vZmYtYnk6IEx1aXMgSGVucmlxdWVzIDxsdWlzLmhlbnJp cXVlc0BjYW5vbmljYWwuY29tPgo+IC0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL21zbS9kc2kvcGxs L2RzaV9wbGwuaCB8IDQgKystLQo+ICAgMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwg MiBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2RzaS9w bGwvZHNpX3BsbC5oIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kc2kvcGxsL2RzaV9wbGwuaAo+IGlu ZGV4IDgwYjYwMzgzMzRhNi4uMmNmMTY2NDcyM2U4IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9tc20vZHNpL3BsbC9kc2lfcGxsLmgKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rz aS9wbGwvZHNpX3BsbC5oCj4gQEAgLTk3LDggKzk3LDggQEAgc3RhdGljIGlubGluZSBzdHJ1Y3Qg bXNtX2RzaV9wbGwgKm1zbV9kc2lfcGxsXzI4bm1faW5pdCgKPiAgIHN0cnVjdCBtc21fZHNpX3Bs bCAqbXNtX2RzaV9wbGxfMjhubV84OTYwX2luaXQoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRl diwKPiAgIAkJCQkJICAgICAgIGludCBpZCk7Cj4gICAjZWxzZQo+IC1zdHJ1Y3QgbXNtX2RzaV9w bGwgKm1zbV9kc2lfcGxsXzI4bm1fODk2MF9pbml0KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBk ZXYsCj4gLQkJCQkJICAgICAgIGludCBpZCkKPiArc3RhdGljIGlubGluZSBzdHJ1Y3QgbXNtX2Rz aV9wbGwgKm1zbV9kc2lfcGxsXzI4bm1fODk2MF9pbml0KAo+ICsJc3RydWN0IHBsYXRmb3JtX2Rl dmljZSAqcGRldiwgaW50IGlkKQo+ICAgewo+ICAgCXJldHVybiBFUlJfUFRSKC1FTk9ERVYpOwo+ ICAgfQo+CgotLSAKVGhlIFF1YWxjb21tIElubm92YXRpb24gQ2VudGVyLCBJbmMuIGlzIGEgbWVt YmVyIG9mIHRoZSBDb2RlIEF1cm9yYSAKRm9ydW0sIGhvc3RlZCBieSBUaGUgTGludXggRm91bmRh dGlvbgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751396AbcBDFJe (ORCPT ); Thu, 4 Feb 2016 00:09:34 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:41140 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750987AbcBDFJd (ORCPT ); Thu, 4 Feb 2016 00:09:33 -0500 Subject: Re: [PATCH] drm/msm/dsi: fix definition of msm_dsi_pll_28nm_8960_init() To: Luis Henriques , David Airlie , Rob Clark References: <1454509515-2365-1-git-send-email-luis.henriques@canonical.com> Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org From: Archit Taneja Message-ID: <56B2DD05.1070405@codeaurora.org> Date: Thu, 4 Feb 2016 10:39:25 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <1454509515-2365-1-git-send-email-luis.henriques@canonical.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Dave, Could you please queue this for the next -rc cycle since it causes a build break? Thanks, Archit > > Signed-off-by: Luis Henriques > --- > 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