diff mbox

asm-generic: remove old nonatomic-io wrapper files

Message ID 1456496980-1852604-1-git-send-email-arnd@arndb.de
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Arnd Bergmann Feb. 26, 2016, 2:29 p.m. UTC 
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

Comments

Christoph Hellwig Feb. 28, 2016, 9:10 a.m. UTC | #1 
Thanks Arnd, this looks good to me:

Reviewed-by: Christoph Hellwig <hch@lst.de>
Vinod Koul Feb. 29, 2016, 6:05 a.m. UTC | #2 
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
Simon Horman March 1, 2016, 12:13 a.m. UTC | #3 
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
Yisen.Zhuang(Zhuangyuzeng) March 1, 2016, 12:59 a.m. UTC | #4 
在 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>
>
diff mbox

Patch

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>