2020-07-07 16:31:42

by Suraj Upadhyay

Subject: [PATCH 1/4] drm: mipi-dsi: Convert logging to drm_* functions.

Convert logging errors from dev_err() to drm_err().

Signed-off-by: Suraj Upadhyay <[email protected]>
---
drivers/gpu/drm/drm_mipi_dsi.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c
index 07102d8da58f..5dd475e82995 100644
--- a/drivers/gpu/drm/drm_mipi_dsi.c
+++ b/drivers/gpu/drm/drm_mipi_dsi.c
@@ -34,6 +34,7 @@
#include <linux/slab.h>

#include <drm/drm_dsc.h>
+#include <drm/drm_print.h>
#include <video/mipi_display.h>

/**
@@ -155,19 +156,18 @@ static int mipi_dsi_device_add(struct mipi_dsi_device *dsi)
static struct mipi_dsi_device *
of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node)
{
- struct device *dev = host->dev;
struct mipi_dsi_device_info info = { };
int ret;
u32 reg;

if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) {
- dev_err(dev, "modalias failure on %pOF\n", node);
+ drm_err(host, "modalias failure on %pOF\n", node);
return ERR_PTR(-EINVAL);
}

ret = of_property_read_u32(node, "reg", &reg);
if (ret) {
- dev_err(dev, "device node %pOF has no valid reg property: %d\n",
+ drm_err(host, "device node %pOF has no valid reg property: %d\n",
node, ret);
return ERR_PTR(-EINVAL);
}
@@ -202,22 +202,21 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *host,
const struct mipi_dsi_device_info *info)
{
struct mipi_dsi_device *dsi;
- struct device *dev = host->dev;
int ret;

if (!info) {
- dev_err(dev, "invalid mipi_dsi_device_info pointer\n");
+ drm_err(host, "invalid mipi_dsi_device_info pointer\n");
return ERR_PTR(-EINVAL);
}

if (info->channel > 3) {
- dev_err(dev, "invalid virtual channel: %u\n", info->channel);
+ drm_err(host, "invalid virtual channel: %u\n", info->channel);
return ERR_PTR(-EINVAL);
}

dsi = mipi_dsi_device_alloc(host);
if (IS_ERR(dsi)) {
- dev_err(dev, "failed to allocate DSI device %ld\n",
+ drm_err(host, "failed to allocate DSI device %ld\n",
PTR_ERR(dsi));
return dsi;
}
@@ -228,7 +227,7 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *host,

ret = mipi_dsi_device_add(dsi);
if (ret) {
- dev_err(dev, "failed to add DSI device %d\n", ret);
+ drm_err(host, "failed to add DSI device %d\n", ret);
kfree(dsi);
return ERR_PTR(ret);
}
--
2.17.1

2020-07-10 18:02:35

by Sam Ravnborg

Subject: Re: [PATCH 1/4] drm: mipi-dsi: Convert logging to drm_* functions.

On Tue, Jul 07, 2020 at 09:58:48PM +0530, Suraj Upadhyay wrote:
> Convert logging errors from dev_err() to drm_err().
>
> Signed-off-by: Suraj Upadhyay <[email protected]>

Thanks. Applied to drm-misc-next as there was no more logging conversion
to do in this file.

Sam

> ---
> drivers/gpu/drm/drm_mipi_dsi.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c
> index 07102d8da58f..5dd475e82995 100644
> --- a/drivers/gpu/drm/drm_mipi_dsi.c
> +++ b/drivers/gpu/drm/drm_mipi_dsi.c
> @@ -34,6 +34,7 @@
> #include <linux/slab.h>
>
> #include <drm/drm_dsc.h>
> +#include <drm/drm_print.h>
> #include <video/mipi_display.h>
>
> /**
> @@ -155,19 +156,18 @@ static int mipi_dsi_device_add(struct mipi_dsi_device *dsi)
> static struct mipi_dsi_device *
> of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node)
> {
> - struct device *dev = host->dev;
> struct mipi_dsi_device_info info = { };
> int ret;
> u32 reg;
>
> if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) {
> - dev_err(dev, "modalias failure on %pOF\n", node);
> + drm_err(host, "modalias failure on %pOF\n", node);
> return ERR_PTR(-EINVAL);
> }
>
> ret = of_property_read_u32(node, "reg", &reg);
> if (ret) {
> - dev_err(dev, "device node %pOF has no valid reg property: %d\n",
> + drm_err(host, "device node %pOF has no valid reg property: %d\n",
> node, ret);
> return ERR_PTR(-EINVAL);
> }
> @@ -202,22 +202,21 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *host,
> const struct mipi_dsi_device_info *info)
> {
> struct mipi_dsi_device *dsi;
> - struct device *dev = host->dev;
> int ret;
>
> if (!info) {
> - dev_err(dev, "invalid mipi_dsi_device_info pointer\n");
> + drm_err(host, "invalid mipi_dsi_device_info pointer\n");
> return ERR_PTR(-EINVAL);
> }
>
> if (info->channel > 3) {
> - dev_err(dev, "invalid virtual channel: %u\n", info->channel);
> + drm_err(host, "invalid virtual channel: %u\n", info->channel);
> return ERR_PTR(-EINVAL);
> }
>
> dsi = mipi_dsi_device_alloc(host);
> if (IS_ERR(dsi)) {
> - dev_err(dev, "failed to allocate DSI device %ld\n",
> + drm_err(host, "failed to allocate DSI device %ld\n",
> PTR_ERR(dsi));
> return dsi;
> }
> @@ -228,7 +227,7 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *host,
>
> ret = mipi_dsi_device_add(dsi);
> if (ret) {
> - dev_err(dev, "failed to add DSI device %d\n", ret);
> + drm_err(host, "failed to add DSI device %d\n", ret);
> kfree(dsi);
> return ERR_PTR(ret);
> }
> --
> 2.17.1
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel