| Message ID | f1a0fd83-4320-f3db-e1bb-3b9832a4429f@users.sourceforge.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jul 22, 2016 at 10:45:30AM +0200, SF Markus Elfring wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Fri, 22 Jul 2016 10:30:30 +0200 > > 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: Markus Elfring <elfring@users.sourceforge.net> Two more applied. And your threading still looks funny, all the patches are in-reply to one I don't even have. -Daniel > --- > drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 3 +-- > drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 +++------ > drivers/gpu/drm/gma500/psb_drv.c | 6 ++---- > drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 +++------ > 4 files changed, 9 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c > index 28f9d90..563f193 100644 > --- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c > +++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c > @@ -246,8 +246,7 @@ 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); > + psb_intel_i2c_destroy(gma_encoder->i2c_bus); > drm_connector_unregister(connector); > drm_connector_cleanup(connector); > kfree(connector); > diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c > index 813ef23..38dc890 100644 > --- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c > +++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c > @@ -444,8 +444,7 @@ 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); > + psb_intel_i2c_destroy(gma_encoder->i2c_bus); > drm_connector_unregister(connector); > drm_connector_cleanup(connector); > kfree(connector); > @@ -780,12 +779,10 @@ 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); > + 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); > + psb_intel_i2c_destroy(gma_encoder->i2c_bus); > failed_blc_i2c: > printk(KERN_ERR "Failed BLC\n"); > drm_encoder_cleanup(encoder); > diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c > index 82b8ce4..50eb944f 100644 > --- a/drivers/gpu/drm/gma500/psb_drv.c > +++ b/drivers/gpu/drm/gma500/psb_drv.c > @@ -210,10 +210,8 @@ 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); > + pci_dev_put(dev_priv->aux_pdev); > + pci_dev_put(dev_priv->lpc_pdev); > > /* Destroy VBT data */ > psb_intel_destroy_bios(dev); > diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c > index b1b9331..e55733c 100644 > --- a/drivers/gpu/drm/gma500/psb_intel_lvds.c > +++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c > @@ -561,8 +561,7 @@ 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); > + psb_intel_i2c_destroy(lvds_priv->ddc_bus); > drm_connector_unregister(connector); > drm_connector_cleanup(connector); > kfree(connector); > @@ -835,11 +834,9 @@ out: > > failed_find: > mutex_unlock(&dev->mode_config.mutex); > - if (lvds_priv->ddc_bus) > - psb_intel_i2c_destroy(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); > + psb_intel_i2c_destroy(lvds_priv->i2c_bus); > failed_blc_i2c: > drm_encoder_cleanup(encoder); > drm_connector_cleanup(connector); > -- > 2.9.2 >
diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c index 28f9d90..563f193 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c +++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c @@ -246,8 +246,7 @@ 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); + psb_intel_i2c_destroy(gma_encoder->i2c_bus); drm_connector_unregister(connector); drm_connector_cleanup(connector); kfree(connector); diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c index 813ef23..38dc890 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c +++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c @@ -444,8 +444,7 @@ 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); + psb_intel_i2c_destroy(gma_encoder->i2c_bus); drm_connector_unregister(connector); drm_connector_cleanup(connector); kfree(connector); @@ -780,12 +779,10 @@ 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); + 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); + psb_intel_i2c_destroy(gma_encoder->i2c_bus); failed_blc_i2c: printk(KERN_ERR "Failed BLC\n"); drm_encoder_cleanup(encoder); diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 82b8ce4..50eb944f 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -210,10 +210,8 @@ 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); + pci_dev_put(dev_priv->aux_pdev); + pci_dev_put(dev_priv->lpc_pdev); /* Destroy VBT data */ psb_intel_destroy_bios(dev); diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c index b1b9331..e55733c 100644 --- a/drivers/gpu/drm/gma500/psb_intel_lvds.c +++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c @@ -561,8 +561,7 @@ 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); + psb_intel_i2c_destroy(lvds_priv->ddc_bus); drm_connector_unregister(connector); drm_connector_cleanup(connector); kfree(connector); @@ -835,11 +834,9 @@ out: failed_find: mutex_unlock(&dev->mode_config.mutex); - if (lvds_priv->ddc_bus) - psb_intel_i2c_destroy(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); + psb_intel_i2c_destroy(lvds_priv->i2c_bus); failed_blc_i2c: drm_encoder_cleanup(encoder); drm_connector_cleanup(connector);