Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1cbaad7 authored Feb 26, 2016 by Arnd Bergmann

asm-generic: remove old nonatomic-io wrapper files



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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Acked-by: Simon Horman <simon.horman@netronome.com>
Acked-by: Yisen Zhuang <yisen.zhuang@huawei.com>

parent 3c047057

drivers/dma/idma64.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"

drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"

drivers/net/ethernet/netronome/nfp/nfp_net.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"

include/asm-generic/io-64-nonatomic-hi-lo.h

deleted100644 → 0

+0 −2

Original line number	Diff line number	Diff line
		/* XXX: delete asm-generic/io-64-nonatomic-hi-lo.h after converting new users */
		#include <linux/io-64-nonatomic-hi-lo.h>

include/asm-generic/io-64-nonatomic-lo-hi.h

deleted100644 → 0

+0 −2

Original line number	Diff line number	Diff line
		/* XXX: delete asm-generic/io-64-nonatomic-lo-hi.h after converting new users */
		#include <linux/io-64-nonatomic-lo-hi.h>