From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753512AbcCABBL (ORCPT ); Mon, 29 Feb 2016 20:01:11 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:54133 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750779AbcCABBJ (ORCPT ); Mon, 29 Feb 2016 20:01:09 -0500 Subject: Re: [PATCH] asm-generic: remove old nonatomic-io wrapper files To: Arnd Bergmann References: <1456496980-1852604-1-git-send-email-arnd@arndb.de> CC: Christoph Hellwig , , Dan Williams , Vinod Koul , Jakub Kicinski , Rolf Neugebauer , "David S. Miller" , yankejian , kenneth Lee , huangdaode , lipeng , , , , , From: Yisen Zhuang Message-ID: <56D4E96A.20509@huawei.com> Date: Tue, 1 Mar 2016 08:59:22 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <1456496980-1852604-1-git-send-email-arnd@arndb.de> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.74.157.38] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.56D4E977.0072,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: aaa95372766f938ad24a45899e446a43 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 2016/2/26 22:29, Arnd Bergmann 写道: > 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 > --- > drivers/dma/idma64.h | 2 +- > drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +- The HNS portion: Acked-by: Yisen Zhuang > 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 >