soundwire: cadence: Remove ret variable from sdw_cdns_irq()

[linux-2.6-microblaze.git] / drivers / soundwire / cadence_master.c

diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index 192dac1..9a9b611 100644 (file)
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -822,7 +822,6 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id)
 {
        struct sdw_cdns *cdns = dev_id;
        u32 int_status;
-       int ret = IRQ_HANDLED;
 
        /* Check if the link is up */
        if (!cdns->link_up)
@@ -900,7 +899,7 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id)
        }
 
        cdns_writel(cdns, CDNS_MCP_INTSTAT, int_status);
-       return ret;
+       return IRQ_HANDLED;
 }
 EXPORT_SYMBOL(sdw_cdns_irq);
 
@@ -1428,20 +1427,6 @@ int sdw_cdns_clock_stop(struct sdw_cdns *cdns, bool block_wake)
                }
        }
 
-       /*
-        * This CMD_ACCEPT should be used when there are no devices
-        * attached on the link when entering clock stop mode. If this is
-        * not set and there is a broadcast write then the command ignored
-        * will be treated as a failure
-        */
-       if (!slave_present)
-               cdns_updatel(cdns, CDNS_MCP_CONTROL,
-                            CDNS_MCP_CONTROL_CMD_ACCEPT,
-                            CDNS_MCP_CONTROL_CMD_ACCEPT);
-       else
-               cdns_updatel(cdns, CDNS_MCP_CONTROL,
-                            CDNS_MCP_CONTROL_CMD_ACCEPT, 0);
-
        /* commit changes */
        ret = cdns_config_update(cdns);
        if (ret < 0) {
@@ -1508,11 +1493,8 @@ int sdw_cdns_clock_restart(struct sdw_cdns *cdns, bool bus_reset)
        cdns_updatel(cdns, CDNS_MCP_CONTROL,
                     CDNS_MCP_CONTROL_BLOCK_WAKEUP, 0);
 
-       /*
-        * clear CMD_ACCEPT so that the command ignored
-        * will be treated as a failure during a broadcast write
-        */
-       cdns_updatel(cdns, CDNS_MCP_CONTROL, CDNS_MCP_CONTROL_CMD_ACCEPT, 0);
+       cdns_updatel(cdns, CDNS_MCP_CONTROL, CDNS_MCP_CONTROL_CMD_ACCEPT,
+                    CDNS_MCP_CONTROL_CMD_ACCEPT);
 
        if (!bus_reset) {