From patchwork Thu Jan 2 10:41:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory CLEMENT X-Patchwork-Id: 3424351 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2FF5E9F295 for ; Thu, 2 Jan 2014 10:42:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4CFCF20149 for ; Thu, 2 Jan 2014 10:42:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83CC820145 for ; Thu, 2 Jan 2014 10:41:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750756AbaABKl6 (ORCPT ); Thu, 2 Jan 2014 05:41:58 -0500 Received: from top.free-electrons.com ([176.31.233.9]:45268 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750748AbaABKl5 (ORCPT ); Thu, 2 Jan 2014 05:41:57 -0500 Received: by mail.free-electrons.com (Postfix, from userid 106) id CC3608C0; Thu, 2 Jan 2014 11:42:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from localhost (tra42-5-83-152-246-54.fbx.proxad.net [83.152.246.54]) by mail.free-electrons.com (Postfix) with ESMTPSA id EA5A87F8; Thu, 2 Jan 2014 11:42:13 +0100 (CET) From: Gregory CLEMENT To: Thomas Petazzoni , Bjorn Helgaas Cc: Jason Cooper , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Gregory CLEMENT Subject: [PATCH] PCI: mvebu: Remove redundant code Date: Thu, 2 Jan 2014 11:41:36 +0100 Message-Id: <1388659296-21569-1-git-send-email-gregory.clement@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In the commit b42285f66f871a989, Sebastian moved clock enable before register access, but during the merge of the commit 9f352f0e6c0fa2dc608812df "PCI: mvebu: Dynamically detect if the PEX link is up to enable hot plug", the moved part was added back. This patch fixes this by removing the redundant code. Signed-off-by: Gregory CLEMENT --- drivers/pci/host/pci-mvebu.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index 2aa7b77c7c88..0b4b99fa1fb5 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c @@ -954,14 +954,6 @@ static int mvebu_pcie_probe(struct platform_device *pdev) mvebu_pcie_set_local_dev_nr(port, 1); - port->clk = of_clk_get_by_name(child, NULL); - if (IS_ERR(port->clk)) { - dev_err(&pdev->dev, "PCIe%d.%d: cannot get clock\n", - port->port, port->lane); - iounmap(port->base); - continue; - } - port->dn = child; spin_lock_init(&port->conf_lock); mvebu_sw_pci_bridge_init(port);