From 3ea8b1cb37fef34a2645e86dcb54d33beaa58660 Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Fri, 23 Apr 2010 07:12:44 +0000 Subject: [PATCH] --- yaml --- r: 190243 b: refs/heads/master c: 7ce97d4f78b62e3af24cdd4df953d777e7efb2f6 h: refs/heads/master i: 190241: 319e3463eb99b45da2a1f852c98749a6c32626fc 190239: 34c90b456d6dcab32b56e42ce9474975206d63c9 v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5966fe6a1734..0e6aeff7c320 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b1fd3e55a39824e68bc8dd055d14892476e3671 +refs/heads/master: 7ce97d4f78b62e3af24cdd4df953d777e7efb2f6 diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c index 080d1cea5b26..df49af382159 100644 --- a/trunk/drivers/net/gianfar.c +++ b/trunk/drivers/net/gianfar.c @@ -549,12 +549,8 @@ static int gfar_parse_group(struct device_node *np, struct gfar_private *priv, const char *model) { u32 *queue_mask; - u64 addr, size; - - addr = of_translate_address(np, - of_get_address(np, 0, &size, NULL)); - priv->gfargrp[priv->num_grps].regs = ioremap(addr, size); + priv->gfargrp[priv->num_grps].regs = of_iomap(np, 0); if (!priv->gfargrp[priv->num_grps].regs) return -ENOMEM;