diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-03-01 14:04:30 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-03-01 14:04:30 +1000 |
| commit | 0feeb106c79532074b370c3cb45f742ef4302cc6 (patch) | |
| tree | 3dd62a1b2d1424b7dd7d17bc7fb4a2305d3ca772 /drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | |
| parent | 8bb5b22255dac09cd74eae9f86333b474d69fbbe (diff) | |
| parent | 7f78c3d69df03674644b724cdf4f01d67962beb4 (diff) | |
| download | kernel_replicant_linux-0feeb106c79532074b370c3cb45f742ef4302cc6.tar.gz kernel_replicant_linux-0feeb106c79532074b370c3cb45f742ef4302cc6.tar.bz2 kernel_replicant_linux-0feeb106c79532074b370c3cb45f742ef4302cc6.zip | |
Merge tag 'tilcdc-4.17' of https://github.com/jsarha/linux into drm-next
drm/tilcdc changes to v4.17
* tag 'tilcdc-4.17' of https://github.com/jsarha/linux:
drm/tilcdc: tilcdc_panel: Rename device from "panel" to "tilcdc-panel"
drm/tilcdc: Add support for drm panels
drm/tilcdc: panel: Use common error handling code in of_get_panel_info()
drm/tilcdc: Delete an error message for a failed memory allocation in seven functions
Diffstat (limited to 'drivers/gpu/drm/tilcdc/tilcdc_tfp410.c')
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c index 7e3643462a08..c45cabb38db0 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c @@ -111,10 +111,8 @@ static struct drm_encoder *tfp410_encoder_create(struct drm_device *dev, tfp410_encoder = devm_kzalloc(dev->dev, sizeof(*tfp410_encoder), GFP_KERNEL); - if (!tfp410_encoder) { - dev_err(dev->dev, "allocation failed\n"); + if (!tfp410_encoder) return NULL; - } tfp410_encoder->dpms = DRM_MODE_DPMS_OFF; tfp410_encoder->mod = mod; @@ -224,10 +222,8 @@ static struct drm_connector *tfp410_connector_create(struct drm_device *dev, tfp410_connector = devm_kzalloc(dev->dev, sizeof(*tfp410_connector), GFP_KERNEL); - if (!tfp410_connector) { - dev_err(dev->dev, "allocation failed\n"); + if (!tfp410_connector) return NULL; - } tfp410_connector->encoder = encoder; tfp410_connector->mod = mod; |