Merge tag 'trace-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / drivers / ssb / host_soc.c

diff --git a/drivers/ssb/host_soc.c b/drivers/ssb/host_soc.c
index d62992d..3b43848 100644 (file)
--- a/drivers/ssb/host_soc.c
+++ b/drivers/ssb/host_soc.c
@@ -8,11 +8,11 @@
  * Licensed under the GNU/GPL. See COPYING for details.
  */
 
+#include "ssb_private.h"
+
 #include <linux/bcm47xx_nvram.h>
 #include <linux/ssb/ssb.h>
 
-#include "ssb_private.h"
-
 static u8 ssb_host_soc_read8(struct ssb_device *dev, u16 offset)
 {
        struct ssb_bus *bus = dev->bus;
@@ -61,7 +61,7 @@ static void ssb_host_soc_block_read(struct ssb_device *dev, void *buffer,
        case sizeof(u16): {
                __le16 *buf = buffer;
 
-               SSB_WARN_ON(count & 1);
+               WARN_ON(count & 1);
                while (count) {
                        *buf = (__force __le16)__raw_readw(addr);
                        buf++;
@@ -72,7 +72,7 @@ static void ssb_host_soc_block_read(struct ssb_device *dev, void *buffer,
        case sizeof(u32): {
                __le32 *buf = buffer;
 
-               SSB_WARN_ON(count & 3);
+               WARN_ON(count & 3);
                while (count) {
                        *buf = (__force __le32)__raw_readl(addr);
                        buf++;
@@ -81,7 +81,7 @@ static void ssb_host_soc_block_read(struct ssb_device *dev, void *buffer,
                break;
        }
        default:
-               SSB_WARN_ON(1);
+               WARN_ON(1);
        }
 }
 #endif /* CONFIG_SSB_BLOCKIO */
@@ -134,7 +134,7 @@ static void ssb_host_soc_block_write(struct ssb_device *dev, const void *buffer,
        case sizeof(u16): {
                const __le16 *buf = buffer;
 
-               SSB_WARN_ON(count & 1);
+               WARN_ON(count & 1);
                while (count) {
                        __raw_writew((__force u16)(*buf), addr);
                        buf++;
@@ -145,7 +145,7 @@ static void ssb_host_soc_block_write(struct ssb_device *dev, const void *buffer,
        case sizeof(u32): {
                const __le32 *buf = buffer;
 
-               SSB_WARN_ON(count & 3);
+               WARN_ON(count & 3);
                while (count) {
                        __raw_writel((__force u32)(*buf), addr);
                        buf++;
@@ -154,7 +154,7 @@ static void ssb_host_soc_block_write(struct ssb_device *dev, const void *buffer,
                break;
        }
        default:
-               SSB_WARN_ON(1);
+               WARN_ON(1);
        }
 }
 #endif /* CONFIG_SSB_BLOCKIO */