From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752293AbcD3Q6P (ORCPT ); Sat, 30 Apr 2016 12:58:15 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:35163 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750973AbcD3Q6N (ORCPT ); Sat, 30 Apr 2016 12:58:13 -0400 From: Sudip Mukherjee To: Peter Huewe , Marcel Selhorst , Jarkko Sakkinen , Jason Gunthorpe Cc: linux-kernel@vger.kernel.org, tpmdd-devel@lists.sourceforge.net, Sudip Mukherjee Subject: [PATCH v2] tpm: use devm_add_action_or_reset Date: Sat, 30 Apr 2016 17:58:06 +0100 Message-Id: <1462035486-26463-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sudip Mukherjee If devm_add_action() fails we are explicitly calling the cleanup function in the error path. Lets use the helper function devm_add_action_or_reset() and return directly as we know the cleanup has been done by the helper. Reviewed-by: Jason Gunthorpe Signed-off-by: Sudip Mukherjee --- v2: rebased against the current charmisc-testing branch. drivers/char/tpm/tpm-chip.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index 274dd01..4c2deea 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -137,11 +137,10 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev, chip->cdev.owner = chip->pdev->driver->owner; chip->cdev.kobj.parent = &chip->dev.kobj; - rc = devm_add_action(dev, (void (*)(void *)) put_device, &chip->dev); - if (rc) { - put_device(&chip->dev); + rc = devm_add_action_or_reset(dev, (void (*)(void *)) put_device, + &chip->dev); + if (rc) return ERR_PTR(rc); - } return chip; } -- 1.9.1