| Message ID | 20190820011721.30136-15-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/omap: Replace custom display drivers with drm_bridge and drm_panel | expand |
On Tue, 20 Aug 2019 04:16:45 +0300 Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > The drmP.h header is deprecated, replace it with the headers > specifically needed by the tfp410 driver. While at it, replace the DRM > print macros with dev_info() and dev_err() instead of including > drm_print.h Looks like drm_print.h is still included. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/bridge/ti-tfp410.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c > index a9359038f7dc..4a468f44ef69 100644 > --- a/drivers/gpu/drm/bridge/ti-tfp410.c > +++ b/drivers/gpu/drm/bridge/ti-tfp410.c > @@ -14,6 +14,7 @@ > #include <linux/platform_device.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_print.h> > #include <drm/drm_probe_helper.h> > @@ -60,7 +61,8 @@ static int tfp410_get_modes(struct drm_connector *connector) > > edid = drm_get_edid(connector, dvi->ddc); > if (!edid) { > - DRM_INFO("EDID read failed. Fallback to standard modes\n"); > + dev_info(dvi->dev, > + "EDID read failed. Fallback to standard modes\n"); > goto fallback; > } > > @@ -364,7 +366,7 @@ static int tfp410_init(struct device *dev, bool i2c) > IRQF_TRIGGER_FALLING | IRQF_ONESHOT, > "hdmi-hpd", dvi); > if (ret) { > - DRM_ERROR("failed to register hpd interrupt\n"); > + dev_err(dev, "failed to register hpd interrupt\n"); > goto fail; > } > }
diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c index a9359038f7dc..4a468f44ef69 100644 --- a/drivers/gpu/drm/bridge/ti-tfp410.c +++ b/drivers/gpu/drm/bridge/ti-tfp410.c @@ -14,6 +14,7 @@ #include <linux/platform_device.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> #include <drm/drm_crtc.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> @@ -60,7 +61,8 @@ static int tfp410_get_modes(struct drm_connector *connector) edid = drm_get_edid(connector, dvi->ddc); if (!edid) { - DRM_INFO("EDID read failed. Fallback to standard modes\n"); + dev_info(dvi->dev, + "EDID read failed. Fallback to standard modes\n"); goto fallback; } @@ -364,7 +366,7 @@ static int tfp410_init(struct device *dev, bool i2c) IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "hdmi-hpd", dvi); if (ret) { - DRM_ERROR("failed to register hpd interrupt\n"); + dev_err(dev, "failed to register hpd interrupt\n"); goto fail; } }
The drmP.h header is deprecated, replace it with the headers specifically needed by the tfp410 driver. While at it, replace the DRM print macros with dev_info() and dev_err() instead of including drm_print.h Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/gpu/drm/bridge/ti-tfp410.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)