From: Yisen Zhuang <Yisen.zhuang@huawei.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Christoph Hellwig <hch@lst.de>,
<linux-arm-kernel@lists.infradead.org>,
Dan Williams <dan.j.williams@intel.com>,
Vinod Koul <vinod.koul@intel.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
Rolf Neugebauer <rolf.neugebauer@netronome.com>,
"David S. Miller" <davem@davemloft.net>,
yankejian <yankejian@huawei.com>,
kenneth Lee <liguozhu@hisilicon.com>,
huangdaode <huangdaode@hisilicon.com>,
lipeng <lipeng321@huawei.com>, <linux-kernel@vger.kernel.org>,
<dmaengine@vger.kernel.org>, <netdev@vger.kernel.org>,
<oss-drivers@netronome.com>, <linux-arch@vger.kernel.org>
Subject: Re: [PATCH] asm-generic: remove old nonatomic-io wrapper files
Date: Tue, 1 Mar 2016 08:59:22 +0800 [thread overview]
Message-ID: <56D4E96A.20509@huawei.com> (raw)
In-Reply-To: <1456496980-1852604-1-git-send-email-arnd@arndb.de>
在 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 <arnd@arndb.de>
> ---
> drivers/dma/idma64.h | 2 +-
> drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +-
The HNS portion:
Acked-by: Yisen Zhuang <yisen.zhuang@huawei.com>
> 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 <linux/spinlock.h>
> #include <linux/types.h>
>
> -#include <asm-generic/io-64-nonatomic-lo-hi.h>
> +#include <linux/io-64-nonatomic-lo-hi.h>
>
> #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 <asm-generic/io-64-nonatomic-hi-lo.h>
> +#include <linux/io-64-nonatomic-hi-lo.h>
> #include <linux/of_mdio.h>
> #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 <linux/interrupt.h>
> #include <linux/netdevice.h>
> #include <linux/pci.h>
> -#include <asm-generic/io-64-nonatomic-hi-lo.h>
> +#include <linux/io-64-nonatomic-hi-lo.h>
>
> #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 <linux/io-64-nonatomic-hi-lo.h>
> 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 <linux/io-64-nonatomic-lo-hi.h>
>
prev parent reply other threads:[~2016-03-01 0:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 14:29 [PATCH] asm-generic: remove old nonatomic-io wrapper files Arnd Bergmann
2016-02-28 9:10 ` Christoph Hellwig
2016-02-29 6:05 ` Vinod Koul
2016-03-01 0:13 ` Simon Horman
2016-03-01 0:59 ` Yisen Zhuang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56D4E96A.20509@huawei.com \
--to=yisen.zhuang@huawei.com \
--cc=arnd@arndb.de \
--cc=dan.j.williams@intel.com \
--cc=davem@davemloft.net \
--cc=dmaengine@vger.kernel.org \
--cc=hch@lst.de \
--cc=huangdaode@hisilicon.com \
--cc=jakub.kicinski@netronome.com \
--cc=liguozhu@hisilicon.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lipeng321@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
--cc=rolf.neugebauer@netronome.com \
--cc=vinod.koul@intel.com \
--cc=yankejian@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).