soundwire: cadence_master: simplify bus clash interrupt clear
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Thu, 25 Jul 2019 23:40:03 +0000 (18:40 -0500)
committerVinod Koul <vkoul@kernel.org>
Fri, 2 Aug 2019 12:06:47 +0000 (17:36 +0530)
The bus clash interrupts are generated when the status is one, and
also cleared by writing a one. It's overkill/useless to use an OR when
the bit is already set.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190725234032.21152-12-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/soundwire/cadence_master.c

index ff4badc..dc2d722 100644 (file)
@@ -578,7 +578,6 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id)
        if (int_status & CDNS_MCP_INT_CTRL_CLASH) {
                /* Slave is driving bit slot during control word */
                dev_err_ratelimited(cdns->dev, "Bus clash for control word\n");
-               int_status |= CDNS_MCP_INT_CTRL_CLASH;
        }
 
        if (int_status & CDNS_MCP_INT_DATA_CLASH) {
@@ -587,7 +586,6 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id)
                 * ownership of data bits or Slave gone bonkers
                 */
                dev_err_ratelimited(cdns->dev, "Bus clash for data word\n");
-               int_status |= CDNS_MCP_INT_DATA_CLASH;
        }
 
        if (int_status & CDNS_MCP_INT_SLAVE_MASK) {