* [PATCH] asm-generic: remove old nonatomic-io wrapper files
@ 2016-02-26 14:29 Arnd Bergmann
2016-02-28 9:10 ` Christoph Hellwig
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Arnd Bergmann @ 2016-02-26 14:29 UTC (permalink / raw)
To: Christoph Hellwig, Arnd Bergmann
Cc: linux-arm-kernel, Dan Williams, Vinod Koul, Jakub Kicinski,
Rolf Neugebauer, David S. Miller, Yisen Zhuang, yankejian,
kenneth Lee, huangdaode, lipeng, linux-kernel, dmaengine, netdev,
oss-drivers, linux-arch
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 +-
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>
--
2.7.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] asm-generic: remove old nonatomic-io wrapper files
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
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Christoph Hellwig @ 2016-02-28 9:10 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Christoph Hellwig, linux-arm-kernel, Dan Williams, Vinod Koul,
Jakub Kicinski, Rolf Neugebauer, David S. Miller, Yisen Zhuang,
yankejian, kenneth Lee, huangdaode, lipeng, linux-kernel,
dmaengine, netdev, oss-drivers, linux-arch
Thanks Arnd, this looks good to me:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] asm-generic: remove old nonatomic-io wrapper files
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
3 siblings, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2016-02-29 6:05 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Christoph Hellwig, linux-arm-kernel, Dan Williams,
Jakub Kicinski, Rolf Neugebauer, David S. Miller, Yisen Zhuang,
yankejian, kenneth Lee, huangdaode, lipeng, linux-kernel,
dmaengine, netdev, oss-drivers, linux-arch
On Fri, Feb 26, 2016 at 03:29:05PM +0100, Arnd Bergmann wrote:
> 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 +-
For this:
Acked-by: Vinod Koul <vinod.koul@intel.com>
Thanks
--
~Vinod
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] asm-generic: remove old nonatomic-io wrapper files
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
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2016-03-01 0:13 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Christoph Hellwig, linux-arm-kernel, Dan Williams, Vinod Koul,
Jakub Kicinski, Rolf Neugebauer, David S. Miller, Yisen Zhuang,
yankejian, kenneth Lee, huangdaode, lipeng, linux-kernel,
dmaengine, netdev, oss-drivers, linux-arch
On Fri, Feb 26, 2016 at 03:29:05PM +0100, Arnd Bergmann wrote:
> 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 +-
> drivers/net/ethernet/netronome/nfp/nfp_net.h | 2 +-
The NFP portion:
Acked-by: Simon Horman <simon.horman@netronome.com>
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] asm-generic: remove old nonatomic-io wrapper files
2016-02-26 14:29 [PATCH] asm-generic: remove old nonatomic-io wrapper files Arnd Bergmann
` (2 preceding siblings ...)
2016-03-01 0:13 ` Simon Horman
@ 2016-03-01 0:59 ` Yisen Zhuang
3 siblings, 0 replies; 5+ messages in thread
From: Yisen Zhuang @ 2016-03-01 0:59 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Christoph Hellwig, linux-arm-kernel, Dan Williams, Vinod Koul,
Jakub Kicinski, Rolf Neugebauer, David S. Miller, yankejian,
kenneth Lee, huangdaode, lipeng, linux-kernel, dmaengine, netdev,
oss-drivers, linux-arch
在 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>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-03-01 1:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).