[folded-merged] rtc-rtc-spear-use-devm_-routines-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: rtc-rtc-spear-use-devm_-routines-fix
has been removed from the -mm tree.  Its filename was
     rtc-rtc-spear-use-devm_-routines-fix.patch

This patch was dropped because it was folded into rtc-rtc-spear-use-devm_-routines.patch

------------------------------------------------------
From: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
Subject: rtc-rtc-spear-use-devm_-routines-fix


Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/rtc/rtc-spear.c |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff -puN drivers/rtc/rtc-spear.c~rtc-rtc-spear-use-devm_-routines-fix drivers/rtc/rtc-spear.c
--- a/drivers/rtc/rtc-spear.c~rtc-rtc-spear-use-devm_-routines-fix
+++ a/drivers/rtc/rtc-spear.c
@@ -363,11 +363,6 @@ static int __devinit spear_rtc_probe(str
 		dev_err(&pdev->dev, "no resource defined\n");
 		return -EBUSY;
 	}
-	if (!devm_request_mem_region(&pdev->dev, res->start, resource_size(res),
-				pdev->name)) {
-		dev_err(&pdev->dev, "rtc region already claimed\n");
-		return -EBUSY;
-	}
 
 	config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL);
 	if (!config) {
@@ -390,10 +385,9 @@ static int __devinit spear_rtc_probe(str
 		return status;
 	}
 
-	config->ioaddr = devm_ioremap(&pdev->dev, res->start,
-			resource_size(res));
+	config->ioaddr = devm_request_and_ioremap(&pdev->dev, res);
 	if (!config->ioaddr) {
-		dev_err(&pdev->dev, "ioremap fail\n");
+		dev_err(&pdev->dev, "request-ioremap fail\n");
 		return -ENOMEM;
 	}
 
_

Patches currently in -mm which might be from viresh.kumar@xxxxxxxxxx are

origin.patch
dmatest-implement-two-helpers-to-unmap-dma-memory.patch
dmatest-check-for-dma-mapping-error.patch
rtc-rtc-spear-use-devm_-routines.patch
rtc-rtc-spear-add-clk_unprepare-support.patch
rtc-rtc-spear-provide-flag-for-no-support-of-uie-mode.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux