pata: ixp4xx: Use IS_ENABLED() to determine endianness
authorLinus Walleij <linus.walleij@linaro.org>
Sun, 25 Jul 2021 23:28:05 +0000 (01:28 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 4 Aug 2021 10:20:27 +0000 (12:20 +0200)
Instead of an ARM-specific ifdef, use the global CPU config
and if (IS_ENABLED()).

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/ata/pata_ixp4xx_cf.c

index 23f0f7cacd52cf9fc5fba01cadf90f76995d9fce..bc5029d6525de191d83ef0faa9af9d2be23b2530 100644 (file)
@@ -107,29 +107,28 @@ static void ixp4xx_setup_port(struct ata_port *ap,
 
        ata_sff_std_ports(ioaddr);
 
-#ifndef __ARMEB__
-
-       /* adjust the addresses to handle the address swizzling of the
-        * ixp4xx in little endian mode.
-        */
-
-       *(unsigned long *)&ioaddr->data_addr            ^= 0x02;
-       *(unsigned long *)&ioaddr->cmd_addr             ^= 0x03;
-       *(unsigned long *)&ioaddr->altstatus_addr       ^= 0x03;
-       *(unsigned long *)&ioaddr->ctl_addr             ^= 0x03;
-       *(unsigned long *)&ioaddr->error_addr           ^= 0x03;
-       *(unsigned long *)&ioaddr->feature_addr         ^= 0x03;
-       *(unsigned long *)&ioaddr->nsect_addr           ^= 0x03;
-       *(unsigned long *)&ioaddr->lbal_addr            ^= 0x03;
-       *(unsigned long *)&ioaddr->lbam_addr            ^= 0x03;
-       *(unsigned long *)&ioaddr->lbah_addr            ^= 0x03;
-       *(unsigned long *)&ioaddr->device_addr          ^= 0x03;
-       *(unsigned long *)&ioaddr->status_addr          ^= 0x03;
-       *(unsigned long *)&ioaddr->command_addr         ^= 0x03;
-
-       raw_cmd ^= 0x03;
-       raw_ctl ^= 0x03;
-#endif
+       if (!IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) {
+               /* adjust the addresses to handle the address swizzling of the
+                * ixp4xx in little endian mode.
+                */
+
+               *(unsigned long *)&ioaddr->data_addr            ^= 0x02;
+               *(unsigned long *)&ioaddr->cmd_addr             ^= 0x03;
+               *(unsigned long *)&ioaddr->altstatus_addr       ^= 0x03;
+               *(unsigned long *)&ioaddr->ctl_addr             ^= 0x03;
+               *(unsigned long *)&ioaddr->error_addr           ^= 0x03;
+               *(unsigned long *)&ioaddr->feature_addr         ^= 0x03;
+               *(unsigned long *)&ioaddr->nsect_addr           ^= 0x03;
+               *(unsigned long *)&ioaddr->lbal_addr            ^= 0x03;
+               *(unsigned long *)&ioaddr->lbam_addr            ^= 0x03;
+               *(unsigned long *)&ioaddr->lbah_addr            ^= 0x03;
+               *(unsigned long *)&ioaddr->device_addr          ^= 0x03;
+               *(unsigned long *)&ioaddr->status_addr          ^= 0x03;
+               *(unsigned long *)&ioaddr->command_addr         ^= 0x03;
+
+               raw_cmd ^= 0x03;
+               raw_ctl ^= 0x03;
+       }
 
        ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", raw_cmd, raw_ctl);
 }