soundwire: cadence: simplifiy cdns_init() (7b174f24) · Commits · 戴 / test

drivers/soundwire/cadence_master.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -1018,22 +1018,12 @@ static u32 cdns_set_initial_frame_shape(int n_rows, int n_cols)
		* sdw_cdns_init() - Cadence initialization
		* @cdns: Cadence instance
		*/
		int sdw_cdns_init(struct sdw_cdns *cdns, bool clock_stop_exit)
		int sdw_cdns_init(struct sdw_cdns *cdns)
		{
		struct sdw_bus *bus = &cdns->bus;
		struct sdw_master_prop *prop = &bus->prop;
		u32 val;
		int divider;
		int ret;

		if (clock_stop_exit) {
		ret = cdns_clear_bit(cdns, CDNS_MCP_CONTROL,
		CDNS_MCP_CONTROL_CLK_STOP_CLR);
		if (ret < 0) {
		dev_err(cdns->dev, "Couldn't exit from clock stop\n");
		return ret;
		}
		}

		/* Set clock divider */
		divider = (prop->mclk_freq / prop->max_clk_freq) - 1;

+1 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ extern struct sdw_master_ops sdw_cdns_master_ops;
		irqreturn_t sdw_cdns_irq(int irq, void *dev_id);
		irqreturn_t sdw_cdns_thread(int irq, void *dev_id);

		int sdw_cdns_init(struct sdw_cdns *cdns, bool clock_stop_exit);
		int sdw_cdns_init(struct sdw_cdns *cdns);
		int sdw_cdns_pdi_init(struct sdw_cdns *cdns,
		struct sdw_cdns_stream_config config);
		int sdw_cdns_exit_reset(struct sdw_cdns *cdns);

+1 −1

Original line number	Diff line number	Diff line
		@@ -1077,7 +1077,7 @@ static int intel_init(struct sdw_intel *sdw)
		intel_link_power_up(sdw);
		intel_shim_init(sdw);

		return sdw_cdns_init(&sdw->cdns, false);
		return sdw_cdns_init(&sdw->cdns);
		}

		/*