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

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

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

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

  devm_request_and_ioremap() : obsoleted by devm_ioremap_resource()

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/w1/masters/mxc_w1.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 950d354..47e12cf 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -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);
-- 
1.7.9.5

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

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

Select CONFIG_W1_MASTER_MXC.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/configs/imx_v6_v7_defconfig |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index e36b010..50f9a7f 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -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
-- 
1.7.9.5

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

[Greg KH]

On Mon, Mar 11, 2013 at 08:18:16PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> 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

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

[Fabio Estevam]

Hi Greg,

On Tue, Mar 12, 2013 at 8:24 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Mon, Mar 11, 2013 at 08:18:16PM -0300, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>
>> 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.