From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752216AbcJCHS1 (ORCPT ); Mon, 3 Oct 2016 03:18:27 -0400 Received: from mga04.intel.com ([192.55.52.120]:20450 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751041AbcJCHST (ORCPT ); Mon, 3 Oct 2016 03:18:19 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,288,1473145200"; d="scan'208";a="1059675295" Date: Mon, 3 Oct 2016 10:18:06 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Christophe JAILLET Cc: airlied@linux.ie, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH] drm: Release resources with a safer function Message-ID: <20161003071806.GS4329@intel.com> References: <1475388082-12656-1-git-send-email-christophe.jaillet@wanadoo.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1475388082-12656-1-git-send-email-christophe.jaillet@wanadoo.fr> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Oct 02, 2016 at 08:01:22AM +0200, Christophe JAILLET wrote: > We should use 'ida_simple_remove()' instead of 'ida_remove()' when freeing > resources allocated with 'ida_simple_get()'. Should fix drm_connector_cleanup() then as well... > > This as been spotted with the following coccinelle script which tries to > detect missing 'ida_simple_remove()' call in error handling paths. > > /////////////// > @@ > expression x; > identifier l; > @@ > > * x = ida_simple_get(...); > ... > if (...) { > ... > } > ... > if (...) { > ... > goto l; > } > ... > * l: ... when != ida_simple_remove(...); > > Signed-off-by: Christophe JAILLET > --- > drivers/gpu/drm/drm_connector.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c > index 26bb78c76481..2e7430283043 100644 > --- a/drivers/gpu/drm/drm_connector.c > +++ b/drivers/gpu/drm/drm_connector.c > @@ -250,10 +250,10 @@ int drm_connector_init(struct drm_device *dev, > connector->debugfs_entry = NULL; > out_put_type_id: > if (ret) > - ida_remove(connector_ida, connector->connector_type_id); > + ida_simple_remove(connector_ida, connector->connector_type_id); > out_put_id: > if (ret) > - ida_remove(&config->connector_ida, connector->index); > + ida_simple_remove(&config->connector_ida, connector->index); > out_put: > if (ret) > drm_mode_object_unregister(dev, &connector->base); > -- > 2.7.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrjälä Intel OTC