Skip to contentSkip to conversation

w1: mxc_w1: Convert to devm_ioremap_resource()

PATCH In review Fabio Estevam 3 participants 5 messages Mar 11, 2013 – Mar 12, 2013

Subsystems (3)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/2 w1: mxc_w1: Convert to devm_ioremap_resource()

From: Fabio Estevam <[email protected]>

According to Documentation/driver-model/devres.txt:

devm_request_and_ioremap() : obsoleted by devm_ioremap_resource()

---
 drivers/w1/masters/mxc_w1.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/w1/masters/mxc_w1.c +3 -3
index 950d354..47e12cf 100644
@@ -121,9 +121,9 @@ static int mxc_w1_probe(struct platform_device *pdev)
 	mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	mdev->regs = devm_request_and_ioremap(&pdev->dev, res);
-	if (!mdev->regs)
-		return -EBUSY;
+	mdev->regs = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(mdev->regs))
+		return PTR_ERR(mdev->regs);
 
 	clk_prepare_enable(mdev->clk);
 	__raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER);
Signature · 1 line
1.7.9.5
author reviewer
#1 lore raw

PATCH 2/2 ARM: imx_v6_v7_defconfig: Select CONFIG_W1_MASTER_MXC

From: Fabio Estevam <[email protected]>

Select CONFIG_W1_MASTER_MXC.

---
 arch/arm/configs/imx_v6_v7_defconfig |    2 ++
 1 file changed, 2 insertions(+)
arch/arm/configs/imx_v6_v7_defconfig +2 -0
index e36b010..50f9a7f 100644
@@ -143,6 +143,8 @@ CONFIG_SPI=y
 CONFIG_SPI_IMX=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MC9S08DZ60=y
+CONFIG_W1=y
+CONFIG_W1_MASTER_MXC=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_IMX2_WDT=y
Signature · 1 line
1.7.9.5
#2 lore raw

Re: [PATCH 2/2] ARM: imx_v6_v7_defconfig: Select CONFIG_W1_MASTER_MXC

Quoted 3 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Select CONFIG_W1_MASTER_MXC.

Why? Don't tell me what you did, that's obvious, it's the story that is needed.

dropped from my queue.

greg k-h

author reviewer
#3 lore raw

Re: [PATCH 2/2] ARM: imx_v6_v7_defconfig: Select CONFIG_W1_MASTER_MXC

Hi Greg,

Quoted 9 lines · Greg KH
Quoted 3 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Select CONFIG_W1_MASTER_MXC.

Why? Don't tell me what you did, that's obvious, it's the story that is needed.

dropped from my queue.

Ok, I will improve the commit log and re-submit it to linux-arm-kernel list, so that it can go via arm tree and avoid any conflict.