From patchwork Thu Jun 4 22:01:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 480911 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8933C140281 for ; Fri, 5 Jun 2015 08:01:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=Kt3o76ar; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753136AbbFDWBy (ORCPT ); Thu, 4 Jun 2015 18:01:54 -0400 Received: from mail-oi0-f46.google.com ([209.85.218.46]:33461 "EHLO mail-oi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753195AbbFDWBx (ORCPT ); Thu, 4 Jun 2015 18:01:53 -0400 Received: by oiww2 with SMTP id w2so41068154oiw.0 for ; Thu, 04 Jun 2015 15:01:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=SX64ZbEqQcy3+O3rb4mSv0/LfmIeURySKn7/4al0PTs=; b=Kt3o76arn+gxx+9i5u9QThF4nxCY7NlQW+GEimvGgStF0sUy65hkA4qiwHjT2+RXkt ZSu8duTTU/ltx/FH282p59lLaqn0t/KFJWii4VcOqOIkHE4/a4bTSQn2dd2sYSYlX3kC OH+sWcYn2F8UMk2bdF3Ji+YR7BiqpYRqQWi/TP1B+zASDNkYqTnG42wFxFnTHG80HBlU ksBmaedQYq+UFLinUkULztIJOhoNq0J2lTFm66qPSa9ZryRvgEv+7RON//NXKE3SSvOl uuEdAYV1vigG2/UWrmB+GxUbmeZ4ti9nQa842iZ7L2blA919pzz5iBdF9fymPhnLZ9Ip yyJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=SX64ZbEqQcy3+O3rb4mSv0/LfmIeURySKn7/4al0PTs=; b=dnYxJsqxSvTXtvWlD3BjhsiAvxZcjypAvfAcOnq3YtMRRHIVrwY2/kb1ptc+oUDi2o C09L0ITnNWOI+xuVez4o9+oprOBX51H0+dmS5S8YVGrZuj8nv2+5I36wlS1sOjEocF0r Ui1EjsOJD0G55VLWFgX6J/epk/O1iBj8luzmZrgXB3Z66xrzMGZdKknwZNB3XqCUL1h4 ugZD9Yyp8mLNsJYWCJst9hVOAbNEE/Emv9JIFBW8ZZG37X/tV8h6oUACyDlnOTW7J+qZ m9CpRcGsz1LuAdCh0SYe1WtI/DIK3GCaqPKn/GExUaCu19Vu9KGPBjde+ksvbQaE41/M mqhA== X-Gm-Message-State: ALoCoQnTVYPxZipD5zfXZN8jHs4tEBTw37pXSj+thmGF0kXq8Jl8Uqb4HmEOeZGayIVn+XjHJsUR X-Received: by 10.60.145.131 with SMTP id su3mr132550oeb.55.1433455313294; Thu, 04 Jun 2015 15:01:53 -0700 (PDT) Received: from localhost (172-9-203-140.lightspeed.spfdmo.sbcglobal.net. [172.9.203.140]) by mx.google.com with ESMTPSA id d74sm2221351oic.9.2015.06.04.15.01.52 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Jun 2015 15:01:52 -0700 (PDT) Subject: [PATCH 2/5] PCI: dra7xx: Use dw_pcie_link_up() consistently To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: Pratyush Anand , Jingoo Han , Richard Zhu , Kishon Vijay Abraham I , Minghuan Lian , Murali Karicheri , Mingkai Hu , Roy Zang , Lucas Stach Date: Thu, 04 Jun 2015 17:01:51 -0500 Message-ID: <20150604220151.4377.38040.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150604220144.4377.40573.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150604220144.4377.40573.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org We already use dw_pcie_link_up() once in dra7xx_pcie_establish_link(), but we duplicate its code later. Use dw_pcie_link_up() for consistency. No functional change. Signed-off-by: Bjorn Helgaas Acked-by: Kishon Vijay Abraham I --- drivers/pci/host/pci-dra7xx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c index 2d57e19..e3d15d7 100644 --- a/drivers/pci/host/pci-dra7xx.c +++ b/drivers/pci/host/pci-dra7xx.c @@ -107,8 +107,7 @@ static int dra7xx_pcie_establish_link(struct pcie_port *pp) dra7xx_pcie_writel(dra7xx, PCIECTRL_DRA7XX_CONF_DEVICE_CMD, reg); while (retries--) { - reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_PHY_CS); - if (reg & LINK_UP) + if (dw_pcie_link_up(pp)) break; usleep_range(10, 20); }