From patchwork Thu Sep 8 22:26:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 9322171 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BECA2607D3 for ; Thu, 8 Sep 2016 22:26:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6F2D29A1A for ; Thu, 8 Sep 2016 22:26:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB61D29A22; Thu, 8 Sep 2016 22:26:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1721F29A1A for ; Thu, 8 Sep 2016 22:26:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758933AbcIHW0Y (ORCPT ); Thu, 8 Sep 2016 18:26:24 -0400 Received: from mail-lf0-f50.google.com ([209.85.215.50]:34401 "EHLO mail-lf0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758316AbcIHW0X (ORCPT ); Thu, 8 Sep 2016 18:26:23 -0400 Received: by mail-lf0-f50.google.com with SMTP id u14so31795403lfd.1 for ; Thu, 08 Sep 2016 15:26:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:organization:user-agent :mime-version:content-transfer-encoding; bh=9njZZqvHY19hNhB7YIMpTt1qYwoRBZoqo8sAT99seHY=; b=n35JG9hh/048DuD6VdZiC+9AJmQepx7kbcsevHVNRVcyuIGXmpEEmWFI+FEJwLjl8/ T86DSs6noPSmnLnKwiMrUlp5ykBIBlmoEN2ZCC8FP66oSfHH9j7KHnoLzdfYoLku08es ModRaOGXJnsG/GYA9DJ3UllvzbsY+1LDbu8BbVWs32P9gem7ZfQdlcGAhavBaDYezd+l RcIl0Yn1apfVj8JNdf0E/O34K5RpM4tgEsn0tTWuCCgqVCsZmjjpoxUi2rVC0JidgQyT ZkpUqPsygqkv4ufqAtFOrpHWQzHLOmXMcCLQ2TRTnLwbvTs4jnfOOXMDyVJqWkOm1IiH at+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:organization :user-agent:mime-version:content-transfer-encoding; bh=9njZZqvHY19hNhB7YIMpTt1qYwoRBZoqo8sAT99seHY=; b=MY1VQmwQNqaI+m1pH37GCHxO4ySRscB7lKrlYhI0sPuQHKcmsxcNNA9pnaSlDNSyZn 3fYCoEDkZGy9CxrgihjAjpV3RsS9fkdxKhcpJO6+iWt+dMkRjNKvyqwQEPbM/Yc7mT6Q GzTTLUwHWzhihAixKWCk9PUg/+x+/2jllfQ1nXJPjQZUiejr3/ii23utGYLMcryhGWYj Xmt6452YAKnaoCRLcpdcMj6mHDNUQs0lIC8EDVfyCp3XGqzHAORss4j6792mLNTbL0F+ r01v5sahuIMz1LDYSkA/9Dx3O2vHMDLUjJv2uETq0Ov4cRr1ArYU0ibRKaKev42eJWHE xyYg== X-Gm-Message-State: AE9vXwM1q5ZiXnDVaJv89QLu7oQyIon7F2m2m1SapUdhLFlUnnpFVR/T37ZdUgifO5l4YQ== X-Received: by 10.25.234.217 with SMTP id y86mr96015lfi.110.1473373581292; Thu, 08 Sep 2016 15:26:21 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.85.174]) by smtp.gmail.com with ESMTPSA id h18sm39379lji.27.2016.09.08.15.26.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Sep 2016 15:26:20 -0700 (PDT) From: Sergei Shtylyov To: horms@verge.net.au, bhelgaas@google.com, linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH] pcie-rcar: fix some checkpatch warnings Date: Fri, 09 Sep 2016 01:26:18 +0300 Message-ID: <4686727.8sYr70Tb6R@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.10 (Linux/4.7.2-101.fc23.x86_64; KDE/4.14.20; x86_64; ; ) MIME-Version: 1.0 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 The R-Car PCIe driver causes 13 warnings from scripts/checkpatch.pl -- let's fix at least 10 easier ones: - line over 80 characters; - blank line missing after declarations; - statements not starting on a tabstop. Signed-off-by: Sergei Shtylyov Acked-by: Simon Horman --- The patch is against the 'next' branch of Bjorn Helgaas' 'pci.git' repo plus two patches posted earlier... drivers/pci/host/pcie-rcar.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 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 Index: pci/drivers/pci/host/pcie-rcar.c =================================================================== --- pci.orig/drivers/pci/host/pcie-rcar.c +++ pci/drivers/pci/host/pcie-rcar.c @@ -1034,12 +1034,16 @@ static int rcar_pcie_inbound_ranges(stru * Set up 64-bit inbound regions as the range parser doesn't * distinguish between 32 and 64-bit types. */ - rcar_pci_write_reg(pcie, lower_32_bits(pci_addr), PCIEPRAR(idx)); + rcar_pci_write_reg(pcie, lower_32_bits(pci_addr), + PCIEPRAR(idx)); rcar_pci_write_reg(pcie, lower_32_bits(cpu_addr), PCIELAR(idx)); - rcar_pci_write_reg(pcie, lower_32_bits(mask) | flags, PCIELAMR(idx)); + rcar_pci_write_reg(pcie, lower_32_bits(mask) | flags, + PCIELAMR(idx)); - rcar_pci_write_reg(pcie, upper_32_bits(pci_addr), PCIEPRAR(idx+1)); - rcar_pci_write_reg(pcie, upper_32_bits(cpu_addr), PCIELAR(idx+1)); + rcar_pci_write_reg(pcie, upper_32_bits(pci_addr), + PCIEPRAR(idx + 1)); + rcar_pci_write_reg(pcie, upper_32_bits(cpu_addr), + PCIELAR(idx + 1)); rcar_pci_write_reg(pcie, 0, PCIELAMR(idx + 1)); pci_addr += size; @@ -1088,6 +1092,7 @@ static int rcar_pcie_parse_map_dma_range /* Get the dma-ranges from DT */ for_each_of_pci_range(&parser, &range) { u64 end = range.cpu_addr + range.size - 1; + dev_dbg(pcie->dev, "0x%08x 0x%016llx..0x%016llx -> 0x%016llx\n", range.flags, range.cpu_addr, end, range.pci_addr); @@ -1101,9 +1106,12 @@ static int rcar_pcie_parse_map_dma_range static const struct of_device_id rcar_pcie_of_match[] = { { .compatible = "renesas,pcie-r8a7779", .data = rcar_pcie_hw_init_h1 }, - { .compatible = "renesas,pcie-rcar-gen2", .data = rcar_pcie_hw_init_gen2 }, - { .compatible = "renesas,pcie-r8a7790", .data = rcar_pcie_hw_init_gen2 }, - { .compatible = "renesas,pcie-r8a7791", .data = rcar_pcie_hw_init_gen2 }, + { .compatible = "renesas,pcie-rcar-gen2", + .data = rcar_pcie_hw_init_gen2 }, + { .compatible = "renesas,pcie-r8a7790", + .data = rcar_pcie_hw_init_gen2 }, + { .compatible = "renesas,pcie-r8a7791", + .data = rcar_pcie_hw_init_gen2 }, { .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init }, {}, }; @@ -1116,7 +1124,8 @@ static int rcar_pcie_parse_request_of_pc resource_size_t iobase; struct resource_entry *win; - err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pci->resources, &iobase); + err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pci->resources, + &iobase); if (err) return err; @@ -1167,8 +1176,8 @@ static int rcar_pcie_probe(struct platfo return err; } - err = rcar_pcie_parse_map_dma_ranges(pcie, pdev->dev.of_node); - if (err) + err = rcar_pcie_parse_map_dma_ranges(pcie, pdev->dev.of_node); + if (err) return err; of_id = of_match_device(rcar_pcie_of_match, pcie->dev);