2008-02-18 13:09:23

by Roel Kluin

Subject: [PATCH] arch/sh/drivers/heartbeat.c ioremap is expected to succeed

!unlikely(hd->base) is equivalent to likely(!hd->base) (for instance see
comments with commit fd312561adcc90e924f35d3032d5493aeb4c3017), I think
the ioremap is expected to succeed? please confirm that's right.
The patch below was *not* tested.
---
ioremap is expected to succeed

Signed-off-by: Roel Kluin <[email protected]>
---
diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c
index b76a14f..ab77b0e 100644
--- a/arch/sh/drivers/heartbeat.c
+++ b/arch/sh/drivers/heartbeat.c
@@ -93,7 +93,7 @@ static int heartbeat_drv_probe(struct platform_device *pdev)
}

hd->base = ioremap_nocache(res->start, res->end - res->start + 1);
- if (!unlikely(hd->base)) {
+ if (unlikely(!hd->base)) {
dev_err(&pdev->dev, "ioremap failed\n");

if (!pdev->dev.platform_data)

2008-02-26 05:21:50

by Paul Mundt

Subject: Re: [PATCH] arch/sh/drivers/heartbeat.c ioremap is expected to succeed

On Mon, Feb 18, 2008 at 02:09:10PM +0100, Roel Kluin wrote:
> !unlikely(hd->base) is equivalent to likely(!hd->base) (for instance see
> comments with commit fd312561adcc90e924f35d3032d5493aeb4c3017), I think
> the ioremap is expected to succeed? please confirm that's right.
> The patch below was *not* tested.
> ---
> ioremap is expected to succeed
>
> Signed-off-by: Roel Kluin <[email protected]>

Indeed it is. Applied, thanks.