* [PATCH 1/2] w1: mxc_w1: Convert to devm_ioremap_resource()
@ 2013-03-11 23:18 Fabio Estevam
2013-03-11 23:18 ` [PATCH 2/2] ARM: imx_v6_v7_defconfig: Select CONFIG_W1_MASTER_MXC Fabio Estevam
2013-03-12 2:12 ` [PATCH 1/2] w1: mxc_w1: Convert to devm_ioremap_resource() Evgeniy Polyakov
0 siblings, 2 replies; 5+ messages in thread
From: Fabio Estevam @ 2013-03-11 23:18 UTC (permalink / raw)
To: zbr; +Cc: gregkh, s.hauer, linux-kernel, linux-arm-kernel, 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: imx_v6_v7_defconfig: Select CONFIG_W1_MASTER_MXC
2013-03-11 23:18 [PATCH 1/2] w1: mxc_w1: Convert to devm_ioremap_resource() Fabio Estevam
@ 2013-03-11 23:18 ` Fabio Estevam
2013-03-12 23:24 ` Greg KH
2013-03-12 2:12 ` [PATCH 1/2] w1: mxc_w1: Convert to devm_ioremap_resource() Evgeniy Polyakov
1 sibling, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2013-03-11 23:18 UTC (permalink / raw)
To: zbr; +Cc: gregkh, s.hauer, linux-kernel, linux-arm-kernel, 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ARM: imx_v6_v7_defconfig: Select CONFIG_W1_MASTER_MXC
2013-03-11 23:18 ` [PATCH 2/2] ARM: imx_v6_v7_defconfig: Select CONFIG_W1_MASTER_MXC Fabio Estevam
@ 2013-03-12 23:24 ` Greg KH
2013-03-12 23:41 ` Fabio Estevam
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2013-03-12 23:24 UTC (permalink / raw)
To: Fabio Estevam; +Cc: zbr, s.hauer, linux-kernel, linux-arm-kernel, Fabio Estevam
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ARM: imx_v6_v7_defconfig: Select CONFIG_W1_MASTER_MXC
2013-03-12 23:24 ` Greg KH
@ 2013-03-12 23:41 ` Fabio Estevam
0 siblings, 0 replies; 5+ messages in thread
From: Fabio Estevam @ 2013-03-12 23:41 UTC (permalink / raw)
To: Greg KH; +Cc: zbr, s.hauer, linux-kernel, linux-arm-kernel, 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] w1: mxc_w1: Convert to devm_ioremap_resource()
2013-03-11 23:18 [PATCH 1/2] w1: mxc_w1: Convert to devm_ioremap_resource() Fabio Estevam
2013-03-11 23:18 ` [PATCH 2/2] ARM: imx_v6_v7_defconfig: Select CONFIG_W1_MASTER_MXC Fabio Estevam
@ 2013-03-12 2:12 ` Evgeniy Polyakov
1 sibling, 0 replies; 5+ messages in thread
From: Evgeniy Polyakov @ 2013-03-12 2:12 UTC (permalink / raw)
To: Fabio Estevam
Cc: gregkh, s.hauer, linux-kernel, linux-arm-kernel, Fabio Estevam
Hi
On Mon, Mar 11, 2013 at 08:18:15PM -0300, Fabio Estevam (festevam@gmail.com) wrote:
> 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>
Both patches look good to me, thank you
Greg, please pull it into you tree
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
--
Evgeniy Polyakov
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-03-12 23:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-11 23:18 [PATCH 1/2] w1: mxc_w1: Convert to devm_ioremap_resource() Fabio Estevam
2013-03-11 23:18 ` [PATCH 2/2] ARM: imx_v6_v7_defconfig: Select CONFIG_W1_MASTER_MXC Fabio Estevam
2013-03-12 23:24 ` Greg KH
2013-03-12 23:41 ` Fabio Estevam
2013-03-12 2:12 ` [PATCH 1/2] w1: mxc_w1: Convert to devm_ioremap_resource() Evgeniy Polyakov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox