From patchwork Tue Apr 21 07:11:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ivan T. Ivanov" X-Patchwork-Id: 47387 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2F5BA20553 for ; Tue, 21 Apr 2015 07:11:25 +0000 (UTC) Received: by wiun10 with SMTP id n10sf2255086wiu.1 for ; Tue, 21 Apr 2015 00:11:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=9N5zQoCBT+JhdgNGlj0h7+LhxvLCcEztsgc5dSP3/C4=; b=l2Yv1NWBvlegsfUQxHms6ANE+ahtznZZDRwHwIIcycfJls5lGkcmRgZi0/NXR4SUOK fB5IpHDxeJyhyWXk8sSDFtoik0HaK+hBHTMK6QngzdwBfS+4PRnLXltjROKTsvnEHWEy DvYRYJZg2optusxwGzXAjF+seR1wDIDo9KklUeCWNwIPyUm8OhMxw2yXkswvcex3YksA YZiJmYHbRzCOHdwNN7cJdFzI1hlnlnQ5BhZ2Rikbvk/xu+QOtRcnOC7QVmHELS6wKylN IWg1VDDSyKb3sGpN25AK3QsEB8QE2ckOOgV2BaiOIsjAq9MXXfG0cbkfKMDnFfXq/Xqv CODQ== X-Gm-Message-State: ALoCoQnNssgwfumYhamJ22MTeI3o8s6rAZuaCqw2xPY/p+yPlUlR1aYIzS1HUXZHbQa6cL/tV/IS X-Received: by 10.112.93.203 with SMTP id cw11mr8574413lbb.0.1429600284468; Tue, 21 Apr 2015 00:11:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.1.170 with SMTP id 10ls5210lan.24.gmail; Tue, 21 Apr 2015 00:11:24 -0700 (PDT) X-Received: by 10.112.126.162 with SMTP id mz2mr18441342lbb.97.1429600284143; Tue, 21 Apr 2015 00:11:24 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id y11si678689lbm.131.2015.04.21.00.11.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Apr 2015 00:11:23 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by labbd9 with SMTP id bd9so144423565lab.2 for ; Tue, 21 Apr 2015 00:11:23 -0700 (PDT) X-Received: by 10.112.161.226 with SMTP id xv2mr18037833lbb.106.1429600283727; Tue, 21 Apr 2015 00:11:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp460906lbt; Tue, 21 Apr 2015 00:11:23 -0700 (PDT) X-Received: by 10.68.108.65 with SMTP id hi1mr34653986pbb.129.1429600282838; Tue, 21 Apr 2015 00:11:22 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d5si1593397pde.239.2015.04.21.00.11.22; Tue, 21 Apr 2015 00:11:22 -0700 (PDT) Received-SPF: none (google.com: linux-arm-msm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753035AbbDUHLM (ORCPT + 5 others); Tue, 21 Apr 2015 03:11:12 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:32896 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752926AbbDUHLI (ORCPT ); Tue, 21 Apr 2015 03:11:08 -0400 Received: by wiax7 with SMTP id x7so100163613wia.0 for ; Tue, 21 Apr 2015 00:11:06 -0700 (PDT) X-Received: by 10.180.82.166 with SMTP id j6mr32384181wiy.43.1429600266791; Tue, 21 Apr 2015 00:11:06 -0700 (PDT) Received: from localhost.localdomain ([37.157.136.206]) by mx.google.com with ESMTPSA id l3sm18332274wiv.18.2015.04.21.00.11.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Apr 2015 00:11:05 -0700 (PDT) From: "Ivan T. Ivanov" To: Alan Stern Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Vivek Gautam Subject: [PATCH] Revert "usb: host: ehci-msm: Use devm_ioremap_resource instead of devm_ioremap" Date: Tue, 21 Apr 2015 10:11:03 +0300 Message-Id: <1429600263-4366-1-git-send-email-ivan.ivanov@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ivan.ivanov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This reverts commit 70843f623b58 ("usb: host: ehci-msm: Use devm_ioremap_resource instead of devm_ioremap"), because msm_otg and this driver are using same address space to access AHB mode and USB command registers. Cc: Vivek Gautam Signed-off-by: Ivan T. Ivanov --- drivers/usb/host/ehci-msm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index 9db74ca..275c92e 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -88,13 +88,20 @@ static int ehci_msm_probe(struct platform_device *pdev) } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - hcd->regs = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(hcd->regs)) { - ret = PTR_ERR(hcd->regs); + if (!res) { + dev_err(&pdev->dev, "Unable to get memory resource\n"); + ret = -ENODEV; goto put_hcd; } + hcd->rsrc_start = res->start; hcd->rsrc_len = resource_size(res); + hcd->regs = devm_ioremap(&pdev->dev, hcd->rsrc_start, hcd->rsrc_len); + if (!hcd->regs) { + dev_err(&pdev->dev, "ioremap failed\n"); + ret = -ENOMEM; + goto put_hcd; + } /* * OTG driver takes care of PHY initialization, clock management,