can: kvaser_pciefd: Use IS_ENABLED() instead of #ifdef

Use the IS_ENABLED() macro to check kernel config defines instead of
ifdef. Use upper_32_bits() to avoid warnings about "right shift count
>= width of type" on systems with CONFIG_ARCH_DMA_ADDR_T_64BIT not
set. In kvaser_pciefd_write_dma_map_altera() use lower_32_bits() for
symmetry.

Signed-off-by: Martin Jocic <martin.jocic@kvaser.com>
Link: https://patch.msgid.link/20240830141038.1402217-1-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c
index a60d9efd5f8d1af3088da9f6e13793909fe27d3d..dc7e5ea1e3ac6151f3ab3ce1fad99df2babce831 100644 (file)
--- a/drivers/net/can/kvaser_pciefd.c
+++ b/drivers/net/can/kvaser_pciefd.c
@@ -1053,13 +1053,13 @@ static void kvaser_pciefd_write_dma_map_altera(struct kvaser_pciefd *pcie,
        void __iomem *serdes_base;
        u32 word1, word2;
 
-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
-       word1 = addr | KVASER_PCIEFD_ALTERA_DMA_64BIT;
-       word2 = addr >> 32;
-#else
-       word1 = addr;
-       word2 = 0;
-#endif
+       if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT)) {
+               word1 = lower_32_bits(addr) | KVASER_PCIEFD_ALTERA_DMA_64BIT;
+               word2 = upper_32_bits(addr);
+       } else {
+               word1 = addr;
+               word2 = 0;
+       }
        serdes_base = KVASER_PCIEFD_SERDES_ADDR(pcie) + 0x8 * index;
        iowrite32(word1, serdes_base);
        iowrite32(word2, serdes_base + 0x4);
@@ -1072,9 +1072,9 @@ static void kvaser_pciefd_write_dma_map_sf2(struct kvaser_pciefd *pcie,
        u32 lsb = addr & KVASER_PCIEFD_SF2_DMA_LSB_MASK;
        u32 msb = 0x0;
 
-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
-       msb = addr >> 32;
-#endif
+       if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT))
+               msb = upper_32_bits(addr);
+
        serdes_base = KVASER_PCIEFD_SERDES_ADDR(pcie) + 0x10 * index;
        iowrite32(lsb, serdes_base);
        iowrite32(msb, serdes_base + 0x4);
@@ -1087,9 +1087,9 @@ static void kvaser_pciefd_write_dma_map_xilinx(struct kvaser_pciefd *pcie,
        u32 lsb = addr & KVASER_PCIEFD_XILINX_DMA_LSB_MASK;
        u32 msb = 0x0;
 
-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
-       msb = addr >> 32;
-#endif
+       if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT))
+               msb = upper_32_bits(addr);
+
        serdes_base = KVASER_PCIEFD_SERDES_ADDR(pcie) + 0x8 * index;
        iowrite32(msb, serdes_base);
        iowrite32(lsb, serdes_base + 0x4);