From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: [PATCH v4 1/6] drm/dsi: check for CONFIG_OF when defining of_mipi_dsi_device_add Date: Thu, 10 Dec 2015 18:11:35 +0530 Message-ID: <1449751300-2841-2-git-send-email-architt@codeaurora.org> References: <1448884892-7731-1-git-send-email-architt@codeaurora.org> <1449751300-2841-1-git-send-email-architt@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1449751300-2841-1-git-send-email-architt@codeaurora.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, a.hajda@samsung.com, jani.nikula@linux.intel.com Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, treding@nvidia.com List-Id: linux-arm-msm@vger.kernel.org b2ZfbWlwaV9kc2lfZGV2aWNlX2FkZCBpcyB1c2VkIG9ubHkgd2hlbiBDT05GSUdfT0YgaXMgZW5h YmxlZC4gSXQKY3VycmVudGx5IHdvcmtzIGlmIE9GIHN1cHBvcnQgaXMgZGlzYWJsZWQsIGJ1dCB0 aGlzIHdpbGwgY2hhbmdlCndoZW4gd2UgYWRkIG1vcmUgZnVuY3Rpb25hbGl0eSB0byBpdC4KCkRl ZmluZSB0aGUgb3JpZ2luYWwgZnVuYyBpZiBDT05GSUdfT0YgaXMgZW5hYmxlZC4gRGVmaW5lIGEg ZHVtbXkgZnVuYwpvdGhlcndpc2UuCgpTaWduZWQtb2ZmLWJ5OiBBcmNoaXQgVGFuZWphIDxhcmNo aXR0QGNvZGVhdXJvcmEub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fbWlwaV9kc2kuYyB8 IDggKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vZHJtX21pcGlfZHNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21p cGlfZHNpLmMKaW5kZXggMmQ1Y2E4ZWUuLmJjZWQyMzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fbWlwaV9kc2kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21pcGlfZHNpLmMK QEAgLTEyOSw2ICsxMjksNyBAQCBzdGF0aWMgaW50IG1pcGlfZHNpX2RldmljZV9hZGQoc3RydWN0 IG1pcGlfZHNpX2RldmljZSAqZHNpKQogCXJldHVybiBkZXZpY2VfYWRkKCZkc2ktPmRldik7CiB9 CiAKKyNpZiBJU19FTkFCTEVEKENPTkZJR19PRikKIHN0YXRpYyBzdHJ1Y3QgbWlwaV9kc2lfZGV2 aWNlICoKIG9mX21pcGlfZHNpX2RldmljZV9hZGQoc3RydWN0IG1pcGlfZHNpX2hvc3QgKmhvc3Qs IHN0cnVjdCBkZXZpY2Vfbm9kZSAqbm9kZSkKIHsKQEAgLTE3MCw2ICsxNzEsMTMgQEAgb2ZfbWlw aV9kc2lfZGV2aWNlX2FkZChzdHJ1Y3QgbWlwaV9kc2lfaG9zdCAqaG9zdCwgc3RydWN0IGRldmlj ZV9ub2RlICpub2RlKQogCiAJcmV0dXJuIGRzaTsKIH0KKyNlbHNlCitzdGF0aWMgc3RydWN0IG1p cGlfZHNpX2RldmljZSAqCitvZl9taXBpX2RzaV9kZXZpY2VfYWRkKHN0cnVjdCBtaXBpX2RzaV9o b3N0ICpob3N0LCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5vZGUpCit7CisJcmV0dXJuIE5VTEw7Cit9 CisjZW5kaWYKIAogaW50IG1pcGlfZHNpX2hvc3RfcmVnaXN0ZXIoc3RydWN0IG1pcGlfZHNpX2hv c3QgKmhvc3QpCiB7Ci0tIApUaGUgUXVhbGNvbW0gSW5ub3ZhdGlvbiBDZW50ZXIsIEluYy4gaXMg YSBtZW1iZXIgb2YgdGhlIENvZGUgQXVyb3JhIEZvcnVtLApob3N0ZWQgYnkgVGhlIExpbnV4IEZv dW5kYXRpb24KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753924AbbLJMl4 (ORCPT ); Thu, 10 Dec 2015 07:41:56 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:36472 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753286AbbLJMlx (ORCPT ); Thu, 10 Dec 2015 07:41:53 -0500 From: Archit Taneja To: dri-devel@lists.freedesktop.org, a.hajda@samsung.com, jani.nikula@linux.intel.com Cc: linux-kernel@vger.kernel.org, airlied@linux.ie, daniel@ffwll.ch, treding@nvidia.com, l.stach@pengutronix.de, robh@kernel.org, linux-arm-msm@vger.kernel.org, Archit Taneja Subject: [PATCH v4 1/6] drm/dsi: check for CONFIG_OF when defining of_mipi_dsi_device_add Date: Thu, 10 Dec 2015 18:11:35 +0530 Message-Id: <1449751300-2841-2-git-send-email-architt@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1449751300-2841-1-git-send-email-architt@codeaurora.org> References: <1448884892-7731-1-git-send-email-architt@codeaurora.org> <1449751300-2841-1-git-send-email-architt@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org of_mipi_dsi_device_add is used only when CONFIG_OF is enabled. It currently works if OF support is disabled, but this will change when we add more functionality to it. Define the original func if CONFIG_OF is enabled. Define a dummy func otherwise. Signed-off-by: Archit Taneja --- drivers/gpu/drm/drm_mipi_dsi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index 2d5ca8ee..bced235 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -129,6 +129,7 @@ static int mipi_dsi_device_add(struct mipi_dsi_device *dsi) return device_add(&dsi->dev); } +#if IS_ENABLED(CONFIG_OF) static struct mipi_dsi_device * of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node) { @@ -170,6 +171,13 @@ of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node) return dsi; } +#else +static struct mipi_dsi_device * +of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node) +{ + return NULL; +} +#endif int mipi_dsi_host_register(struct mipi_dsi_host *host) { -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation