Commit 44fb4b8a authored by Markus Elfring's avatar Markus Elfring Committed by Daniel Vetter
Browse files

GPU-DRM-GMA500: Delete unnecessary checks before two function calls 



The functions pci_dev_put() and psb_intel_i2c_destroy() test whether
their argument is NULL and then return immediately.
Thus the tests around their calls are not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/f1a0fd83-4320-f3db-e1bb-3b9832a4429f@users.sourceforge.net
parent 76e4c327

drivers/gpu/drm/gma500/cdv_intel_hdmi.c

+1 −2
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ static void cdv_hdmi_destroy(struct drm_connector *connector) 
{

	struct gma_encoder *gma_encoder = gma_attached_encoder(connector);



	if (gma_encoder->i2c_bus)

	psb_intel_i2c_destroy(gma_encoder->i2c_bus);

	drm_connector_unregister(connector);

	drm_connector_cleanup(connector);

drivers/gpu/drm/gma500/cdv_intel_lvds.c

+3 −6
Original line number Diff line number Diff line
@@ -444,7 +444,6 @@ static void cdv_intel_lvds_destroy(struct drm_connector *connector) 
{

	struct gma_encoder *gma_encoder = gma_attached_encoder(connector);



	if (gma_encoder->i2c_bus)

	psb_intel_i2c_destroy(gma_encoder->i2c_bus);

	drm_connector_unregister(connector);

	drm_connector_cleanup(connector);
@@ -780,11 +779,9 @@ out: 
failed_find:

	mutex_unlock(&dev->mode_config.mutex);

	printk(KERN_ERR "Failed find\n");

	if (gma_encoder->ddc_bus)

	psb_intel_i2c_destroy(gma_encoder->ddc_bus);

failed_ddc:

	printk(KERN_ERR "Failed DDC\n");

	if (gma_encoder->i2c_bus)

	psb_intel_i2c_destroy(gma_encoder->i2c_bus);

failed_blc_i2c:

	printk(KERN_ERR "Failed BLC\n");

drivers/gpu/drm/gma500/psb_drv.c

+2 −4
Original line number Diff line number Diff line
@@ -210,9 +210,7 @@ static int psb_driver_unload(struct drm_device *dev) 
			iounmap(dev_priv->aux_reg);

			dev_priv->aux_reg = NULL;

		}

		if (dev_priv->aux_pdev)

		pci_dev_put(dev_priv->aux_pdev);

		if (dev_priv->lpc_pdev)

		pci_dev_put(dev_priv->lpc_pdev);



		/* Destroy VBT data */

drivers/gpu/drm/gma500/psb_intel_lvds.c

+3 −6
Original line number Diff line number Diff line
@@ -561,7 +561,6 @@ void psb_intel_lvds_destroy(struct drm_connector *connector) 
	struct gma_encoder *gma_encoder = gma_attached_encoder(connector);

	struct psb_intel_lvds_priv *lvds_priv = gma_encoder->dev_priv;



	if (lvds_priv->ddc_bus)

	psb_intel_i2c_destroy(lvds_priv->ddc_bus);

	drm_connector_unregister(connector);

	drm_connector_cleanup(connector);
@@ -835,10 +834,8 @@ out: 


failed_find:

	mutex_unlock(&dev->mode_config.mutex);

	if (lvds_priv->ddc_bus)

	psb_intel_i2c_destroy(lvds_priv->ddc_bus);

failed_ddc:

	if (lvds_priv->i2c_bus)

	psb_intel_i2c_destroy(lvds_priv->i2c_bus);

failed_blc_i2c:

	drm_encoder_cleanup(encoder);

CRA Git | Maintained and supported by SUSTech CRA and CCSE