Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964968AbcDYUvi (ORCPT ); Mon, 25 Apr 2016 16:51:38 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:36944 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964853AbcDYUvh (ORCPT ); Mon, 25 Apr 2016 16:51:37 -0400 From: Sudip Mukherjee To: Eli Billauer , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Sudip Mukherjee Subject: [PATCH] char: xillybus: use devm_add_action_or_reset Date: Mon, 25 Apr 2016 21:51:29 +0100 Message-Id: <1461617489-32569-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 Content-Length: 1632 Lines: 52 If devm_add_action() fails we are explicitly calling dma_unmap_single() and kfree(). Lets use the helper devm_add_action_or_reset() and return directly in case of error, as we know that the cleanup function has been already called by the helper if there was any error. Signed-off-by: Sudip Mukherjee --- drivers/char/xillybus/xillybus_of.c | 7 ++----- drivers/char/xillybus/xillybus_pcie.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/char/xillybus/xillybus_of.c b/drivers/char/xillybus/xillybus_of.c index 7818650..17f45b6 100644 --- a/drivers/char/xillybus/xillybus_of.c +++ b/drivers/char/xillybus/xillybus_of.c @@ -101,13 +101,10 @@ static int xilly_map_single_of(struct xilly_endpoint *ep, *ret_dma_handle = addr; - rc = devm_add_action(ep->dev, xilly_of_unmap, this); + rc = devm_add_action_or_reset(ep->dev, xilly_of_unmap, this); - if (rc) { - dma_unmap_single(ep->dev, addr, size, direction); - kfree(this); + if (rc) return rc; - } return 0; } diff --git a/drivers/char/xillybus/xillybus_pcie.c b/drivers/char/xillybus/xillybus_pcie.c index 9418300..99c688f 100644 --- a/drivers/char/xillybus/xillybus_pcie.c +++ b/drivers/char/xillybus/xillybus_pcie.c @@ -120,12 +120,9 @@ static int xilly_map_single_pci(struct xilly_endpoint *ep, *ret_dma_handle = addr; - rc = devm_add_action(ep->dev, xilly_pci_unmap, this); - if (rc) { - pci_unmap_single(ep->pdev, addr, size, pci_direction); - kfree(this); + rc = devm_add_action_or_reset(ep->dev, xilly_pci_unmap, this); + if (rc) return rc; - } return 0; } -- 1.9.1