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

Commit 8fdf9062 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Greg Kroah-Hartman
Browse files

ntb: ntb_hw_switchtec: Cleanup 64bit IO defines to use the common header 



Clean up the ifdefs which conditionally defined the io{read|write}64
functions in favour of the new common io-64-nonatomic-lo-hi header.

Per a nit from Andy Shevchenko, the include list is also made
alphabetical.

Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Cc: Jon Mason <jdmason@kudzu.us>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0795ccde

drivers/ntb/hw/mscc/ntb_hw_switchtec.c

+4 −32
Original line number Diff line number Diff line
@@ -13,13 +13,14 @@ 
 *

 */



#include <linux/switchtec.h>

#include <linux/module.h>

#include <linux/interrupt.h>

#include <linux/io-64-nonatomic-lo-hi.h>

#include <linux/delay.h>

#include <linux/kthread.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/ntb.h>

#include <linux/pci.h>

#include <linux/switchtec.h>



MODULE_DESCRIPTION("Microsemi Switchtec(tm) NTB Driver");

MODULE_VERSION("0.1");
@@ -36,35 +37,6 @@ module_param(use_lut_mws, bool, 0644); 
MODULE_PARM_DESC(use_lut_mws,

		 "Enable the use of the LUT based memory windows");



#ifndef ioread64

#ifdef readq

#define ioread64 readq

#else

#define ioread64 _ioread64

static inline u64 _ioread64(void __iomem *mmio)

{

	u64 low, high;



	low = ioread32(mmio);

	high = ioread32(mmio + sizeof(u32));

	return low | (high << 32);

}

#endif

#endif



#ifndef iowrite64

#ifdef writeq

#define iowrite64 writeq

#else

#define iowrite64 _iowrite64

static inline void _iowrite64(u64 val, void __iomem *mmio)

{

	iowrite32(val, mmio);

	iowrite32(val >> 32, mmio + sizeof(u32));

}

#endif

#endif



#define SWITCHTEC_NTB_MAGIC 0x45CC0001

#define MAX_MWS     128