From patchwork Mon Sep 8 04:40:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pratyush ANAND X-Patchwork-Id: 4859961 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4E078C0338 for ; Mon, 8 Sep 2014 04:40:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F0CF200FF for ; Mon, 8 Sep 2014 04:40:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A1F3E2008F for ; Mon, 8 Sep 2014 04:40:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751398AbaIHEkk (ORCPT ); Mon, 8 Sep 2014 00:40:40 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:49038 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750845AbaIHEkk (ORCPT ); Mon, 8 Sep 2014 00:40:40 -0400 Received: from pps.filterd (m0046670.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.14.5/8.14.5) with SMTP id s884eVeX017330; Mon, 8 Sep 2014 06:40:31 +0200 Received: from beta.dmz-ap.st.com (beta.dmz-ap.st.com [138.198.100.35]) by mx07-00178001.pphosted.com with ESMTP id 1p7autbq20-1 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 08 Sep 2014 06:40:31 +0200 Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 8EF5823; Mon, 8 Sep 2014 04:40:27 +0000 (GMT) Received: from Webmail-ap.st.com (eapex1hubcas1.st.com [10.80.176.8]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 98CF8AA5; Mon, 8 Sep 2014 04:40:26 +0000 (GMT) Received: from localhost (10.199.210.48) by Webmail-ap.st.com (10.80.176.7) with Microsoft SMTP Server (TLS) id 8.3.298.1; Mon, 8 Sep 2014 12:40:25 +0800 Date: Mon, 8 Sep 2014 10:10:14 +0530 From: Pratyush Anand To: Bjorn Helgaas Cc: "jg1.han@samsung.com" , Mohit KUMAR DCG , "linux-pci@vger.kernel.org" Subject: Re: [PATCH] PCIe: Designware: Extract struct pcie_port_info elements into struct pcie_port Message-ID: <20140908044014.GC2464@pratyush-vbox> References: <67297b465f1b531aec9f290246698b23aa994381.1407906240.git.pratyush.anand@st.com> <20140906000329.GN8080@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140906000329.GN8080@google.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.12.52, 1.0.27, 0.0.0000 definitions=2014-09-08_01:2014-09-05, 2014-09-07, 1970-01-01 signatures=0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Sat, Sep 06, 2014 at 08:03:29AM +0800, Bjorn Helgaas wrote: > On Sat, Aug 16, 2014 at 12:52:39PM +0530, Pratyush Anand wrote: > > struct pcie_port_info elements are not containing any exclusive > > information compared to other elements of struct pcie_port. So, keeping > > a separate structure like struct pcie_port_info does not seem very > > logical. Therefore remove this struct and embed its elements directly > > into struct pcie_port. > > > > Signed-off-by: Pratyush Anand > > Applied with Mohit's ack to pci/host-designware for v3.18, thanks! > > I had to resolve some merge conflicts, so look it over and make sure I > did it correctly. Following diff need to be merged with the commit. Let me know if I need to resend this patch rebased on top of pci/host-designware ~ 1. ~Pratyush --- 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/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 04a71093bf9a..5d720c21fdc0 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -520,7 +520,7 @@ int __init dw_pcie_host_init(struct pcie_port *pp) } if (!pp->va_cfg1_base) { - pp->cfg1_base = pp->cfg.start + pp->config.cfg0_size; + pp->cfg1_base = pp->cfg.start + pp->cfg0_size; pp->va_cfg1_base = devm_ioremap(pp->dev, pp->cfg1_base, pp->cfg1_size); if (!pp->va_cfg1_base) {