!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) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/