staging: fsl-mc: use generic memory barriers

No need to use arch-specific memory barriers; switch to using generic
ones. The rmb()s were useless so drop them.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/fsl-mc/bus/mc-sys.c b/drivers/staging/fsl-mc/bus/mc-sys.c
index a1704c3a6a780567b7d72ecca41eb4aa7c7f5edd..012abd5690d7c47e29a2246a02f15be131928262 100644 (file)
--- a/drivers/staging/fsl-mc/bus/mc-sys.c
+++ b/drivers/staging/fsl-mc/bus/mc-sys.c
@@ -127,7 +127,8 @@ static inline void mc_write_command(struct mc_command __iomem *portal,
        /* copy command parameters into the portal */
        for (i = 0; i < MC_CMD_NUM_OF_PARAMS; i++)
                __raw_writeq(cmd->params[i], &portal->params[i]);
-       __iowmb();
+       /* ensure command params are committed before submitting it */
+       wmb();
 
        /* submit the command by writing the header */
        __raw_writeq(cmd->header, &portal->header);
@@ -150,9 +151,7 @@ static inline enum mc_cmd_status mc_read_response(struct mc_command __iomem *
        enum mc_cmd_status status;
 
        /* Copy command response header from MC portal: */
-       __iormb();
        resp->header = __raw_readq(&portal->header);
-       __iormb();
        status = mc_cmd_hdr_read_status(resp);
        if (status != MC_CMD_STATUS_OK)
                return status;
@@ -160,7 +159,6 @@ static inline enum mc_cmd_status mc_read_response(struct mc_command __iomem *
        /* Copy command response data from MC portal: */
        for (i = 0; i < MC_CMD_NUM_OF_PARAMS; i++)
                resp->params[i] = __raw_readq(&portal->params[i]);
-       __iormb();
 
        return status;
 }