From patchwork Mon May 30 12:33:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel J Blueman X-Patchwork-Id: 829842 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4UCXL83023627 for ; Mon, 30 May 2011 12:33:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756612Ab1E3Mdj (ORCPT ); Mon, 30 May 2011 08:33:39 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:38170 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756531Ab1E3Mdi (ORCPT ); Mon, 30 May 2011 08:33:38 -0400 Received: by pwi15 with SMTP id 15so1625683pwi.19 for ; Mon, 30 May 2011 05:33:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=b4fEAPjzR4ourbX0z/HNiCuHSelxnz/nxqDdLKIu22Y=; b=u6yy59VrL6VqvCIg4n0aKN4OS3/6Ul4D/FRy8RH3wbEV11pmMfZY51b1HFq+kwbfkT IMb/pH0fNBdA2bbwLqALGXcLqkrxaIpW9vmmKbc0PITarOEZWRwM/QBzVA/Kx1zeKtTq UhMAe44aFVELOw9mvt+amQsuBC4Xx8pb6gFxk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=HBbdcon4yo2NDAtMXxqX/OPzyEK7dwWzdDsIHbBGvpNWyjZMLTbgf2sP+A1Cw/l0NU OK3WfrqMSl7ltyb/TwHubqcej5XYzRfUCpvPfSzDvCbraKXE96PuSFqWcYsDYKHp/QMr nBUhJT+U9g23L2+z2XkyHXk+HYBBDPJWik8SY= Received: by 10.68.29.133 with SMTP id k5mr1932082pbh.467.1306758818149; Mon, 30 May 2011 05:33:38 -0700 (PDT) Received: from localhost.localdomain (bb116-14-40-165.singnet.com.sg [116.14.40.165]) by mx.google.com with ESMTPS id k4sm2854359pbl.43.2011.05.30.05.33.35 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 May 2011 05:33:36 -0700 (PDT) From: Daniel J Blueman To: Chris Ball Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel J Blueman Subject: [PATCH] sdhci: fix undue iomem warning Date: Mon, 30 May 2011 20:33:16 +0800 Message-Id: <1306758796-4254-1-git-send-email-daniel.blueman@gmail.com> X-Mailer: git-send-email 1.7.4.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 30 May 2011 12:33:40 +0000 (UTC) Some newer SDHCI controllers have memory mapped I/O regions of 512 bytes, so accept these without warning. Signed-off-by: Daniel J Blueman --- drivers/mmc/host/sdhci-pci.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 936bbca..ae948b0 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -918,8 +918,9 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( return ERR_PTR(-ENODEV); } - if (pci_resource_len(pdev, bar) != 0x100) { - dev_err(&pdev->dev, "Invalid iomem size. You may " + int len = pci_resource_len(pdev, bar); + if (len != 0x100 && len != 0x200) { + dev_warn(&pdev->dev, "Invalid iomem size. You may " "experience problems.\n"); }