lkml.org 
[lkml]   [2018]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH v9 8/8] 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.

    Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
    Cc: Jon Mason <jdmason@kudzu.us>
    ---
    drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 30 +-----------------------------
    1 file changed, 1 insertion(+), 29 deletions(-)

    diff --git a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
    index afe8ed6f3b23..53d3a34cddf3 100644
    --- a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
    +++ b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
    @@ -19,6 +19,7 @@
    #include <linux/kthread.h>
    #include <linux/interrupt.h>
    #include <linux/ntb.h>
    +#include <linux/io-64-nonatomic-lo-hi.h>

    MODULE_DESCRIPTION("Microsemi Switchtec(tm) NTB Driver");
    MODULE_VERSION("0.1");
    @@ -35,35 +36,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

    --
    2.11.0
    \
     
     \ /
      Last update: 2018-01-03 19:09    [W:4.145 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site