From patchwork Fri Feb 26 14:29:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8437851 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BEEC09F2F0 for ; Fri, 26 Feb 2016 14:32:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3CAF20211 for ; Fri, 26 Feb 2016 14:32:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B4C220107 for ; Fri, 26 Feb 2016 14:32:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754273AbcBZObm (ORCPT ); Fri, 26 Feb 2016 09:31:42 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:52166 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753895AbcBZObl (ORCPT ); Fri, 26 Feb 2016 09:31:41 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MJkO4-1aaPrX3Qe4-0017Gb; Fri, 26 Feb 2016 15:29:52 +0100 From: Arnd Bergmann To: Christoph Hellwig , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, Dan Williams , Vinod Koul , Jakub Kicinski , Rolf Neugebauer , "David S. Miller" , Yisen Zhuang , yankejian , kenneth Lee , huangdaode , lipeng , linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, netdev@vger.kernel.org, oss-drivers@netronome.com, linux-arch@vger.kernel.org Subject: [PATCH] asm-generic: remove old nonatomic-io wrapper files Date: Fri, 26 Feb 2016 15:29:05 +0100 Message-Id: <1456496980-1852604-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:RmQJxYnBYL0xeoj42o7A9Z7pvUrRXMOazVfTjw1ewPwrDsyJFf2 jz27vTliOjZ03EyV7Uh0vNe2FtDAmG0GJymXIiqF7wCiLbm2vt4dzoSjZKPlslozWdrO/3x ctDYAJ0+NhMYlo50Dc4sJtCkrR+yTlOuUEVYq4sBojsYjbULIFZ9A1nfSKhzt6Xj7VsfjhF edOft+tDlpZ73Abz69dYg== X-UI-Out-Filterresults: notjunk:1; V01:K0:fDBf/7v3Tqg=:ZQovRtHM7MX2YGnSJulfec zZ4tBWb0OUZah/YV0tfwm0N3Sma6lCHZWKi5gSLFxTC4YGBWbn/bJ5k0fzKYiqp2Xzh3tgdJq uDnS5cO2Whn3cYNtBG0mytGQAfcok2uaBHBhziggMjd1MmW6vJ1XU+09gXVy5v8ljNocNuAsn uZnObEFx3Ml/nbPJNYkKgxt4s67W6IVoXbdcFXOg3RL0j8jcG9TBwDv6btfJi6yMsi3ZUc0FQ ETqnyieVIuADj1FJixKQmy8BibDfLVktVTB3FdVLXJwvCALKDbtVnEWMI0wIHmGIXFZJc+NRV sAYwZbEu5EPgTJjNvKGabSPaFUrXHZJbiZ45jmcoNzCtc+MwAnc5lwwtm5hqaekgDDHNFk440 sahf2+IJCBQ99fHrTj5hnCBDePdXSUmeJzxuPJ20iC75hvFczBC2NH4loyeOt/S5RUOqYWdnT tMDTE9qbXWn/n+eE3Q9vrG4K9Y1IkDNbGKMSqpcflyq6R8IrQB78oO174B5yPPKL7vNumJdFe dr7Db39HVvdtrJzcB7BFl6UmydsRi2RDs7MCC+TdKuEubSZ0HaS2WexdVeABnj+hb1LOX+D8x vurlwqGREmACh81U/+fYm95blGbr+8+Dm9TO1+9Cp0Fvh+qBG06x5u2AQj15JvsXgrI78syzu fUWPRKejpaN+7hD7t0gFPqsZaeFw7GglbCbdOCMrH0G/9cuHm5q6/j1ctesYRvo8bXgk= Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-6.9 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 The two header files got moved to include/linux, and most users were already converted, this changes the remaining drivers and removes the files. Signed-off-by: Arnd Bergmann Reviewed-by: Christoph Hellwig Acked-by: Vinod Koul Acked-by: Simon Horman Acked-by: Yisen Zhuang --- drivers/dma/idma64.h | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +- drivers/net/ethernet/netronome/nfp/nfp_net.h | 2 +- include/asm-generic/io-64-nonatomic-hi-lo.h | 2 -- include/asm-generic/io-64-nonatomic-lo-hi.h | 2 -- 5 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 include/asm-generic/io-64-nonatomic-hi-lo.h delete mode 100644 include/asm-generic/io-64-nonatomic-lo-hi.h diff --git a/drivers/dma/idma64.h b/drivers/dma/idma64.h index 8423f13ed0da..a52ad6bcf86a 100644 --- a/drivers/dma/idma64.h +++ b/drivers/dma/idma64.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include "virt-dma.h" diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c index 802d55457f19..fd90f3737963 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c @@ -7,7 +7,7 @@ * (at your option) any later version. */ -#include +#include #include #include "hns_dsaf_main.h" #include "hns_dsaf_mac.h" diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h index ab264e1bccd0..75683fb26734 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include "nfp_net_ctrl.h" diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/asm-generic/io-64-nonatomic-hi-lo.h deleted file mode 100644 index 32b73abce1b0..000000000000 --- a/include/asm-generic/io-64-nonatomic-hi-lo.h +++ /dev/null @@ -1,2 +0,0 @@ -/* XXX: delete asm-generic/io-64-nonatomic-hi-lo.h after converting new users */ -#include diff --git a/include/asm-generic/io-64-nonatomic-lo-hi.h b/include/asm-generic/io-64-nonatomic-lo-hi.h deleted file mode 100644 index 55a627c37721..000000000000 --- a/include/asm-generic/io-64-nonatomic-lo-hi.h +++ /dev/null @@ -1,2 +0,0 @@ -/* XXX: delete asm-generic/io-64-nonatomic-lo-hi.h after converting new users */ -#include