2 files changed, 2 insertions, 19 deletions

diff --git a/drivers/char/xillybus/xillybus_of.c b/drivers/char/xillybus/xillybus_of.c
index 781865084dc1..78a492f5acfb 100644
--- a/drivers/char/xillybus/xillybus_of.c
+++ b/drivers/char/xillybus/xillybus_of.c
@@ -81,7 +81,6 @@ static int xilly_map_single_of(struct xilly_endpoint *ep,
 {
         dma_addr_t addr;
         struct xilly_mapping *this;
-        int rc;
 
         this = kzalloc(sizeof(*this), GFP_KERNEL);
         if (!this)
@@ -101,15 +100,7 @@ static int xilly_map_single_of(struct xilly_endpoint *ep,
 
         *ret_dma_handle = addr;
 
-        rc = devm_add_action(ep->dev, xilly_of_unmap, this);
-
-        if (rc) {
-                dma_unmap_single(ep->dev, addr, size, direction);
-                kfree(this);
-                return rc;
-        }
-
-        return 0;
+        return devm_add_action_or_reset(ep->dev, xilly_of_unmap, this);
 }
 
 static struct xilly_endpoint_hardware of_hw = {
diff --git a/drivers/char/xillybus/xillybus_pcie.c b/drivers/char/xillybus/xillybus_pcie.c
index 9418300214e9..dff2d1538164 100644
--- a/drivers/char/xillybus/xillybus_pcie.c
+++ b/drivers/char/xillybus/xillybus_pcie.c
@@ -98,7 +98,6 @@ static int xilly_map_single_pci(struct xilly_endpoint *ep,
         int pci_direction;
         dma_addr_t addr;
         struct xilly_mapping *this;
-        int rc;
 
         this = kzalloc(sizeof(*this), GFP_KERNEL);
         if (!this)
@@ -120,14 +119,7 @@ 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);
-                return rc;
-        }
-
-        return 0;
+        return devm_add_action_or_reset(ep->dev, xilly_pci_unmap, this);
 }
 
 static struct xilly_endpoint_hardware pci_hw = {