Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9e9c3d5 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: dp: replace pr_err with DP_ERR"

parents a7844b99 1cbd7ae1

msm/dp/dp_display.c

+1 −1
Original line number Diff line number Diff line
@@ -3051,7 +3051,7 @@ static int dp_display_setup_colospace(struct dp_display *dp_display, 
	struct dp_display_private *dp;



	if (!dp_display || !panel) {

		pr_err("invalid input\n");

		DP_ERR("invalid input\n");

		return -EINVAL;

	}

msm/dp/dp_drm.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#include <drm/drm_atomic_helper.h>
@@ -336,7 +336,7 @@ int dp_connector_set_colorspace(struct drm_connector *connector, 


	sde_conn = to_sde_connector(connector);

	if (!sde_conn->drv_panel) {

		pr_err("invalid dp panel\n");

		DP_ERR("invalid dp panel\n");

		return -EINVAL;

	}

msm/dp/dp_panel.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.

 */



#include "dp_panel.h"
@@ -2571,7 +2571,7 @@ static int dp_panel_set_colorspace(struct dp_panel *dp_panel, 
	struct dp_panel_private *panel;



	if (!dp_panel) {

		pr_err("invalid input\n");

		DP_ERR("invalid input\n");

		rc = -EINVAL;

		goto end;

	}