Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit de43affe authored by Stephen Boyd's avatar Stephen Boyd Committed by Mark Brown
Browse files

spi: spi-geni-qcom: Get rid of forward declaration 



We don't need this forward declaration. Move the function to where it
needed so we can drop it and shave some lines of code.

CC: Girish Mahadevan <girishm@codeaurora.org>
CC: Dilip Kota <dkota@codeaurora.org>
CC: Alok Chauhan <alokc@codeaurora.org>
Cc: Douglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0357a3da

drivers/spi/spi-geni-qcom.c

+26 −29
Original line number Diff line number Diff line
@@ -89,9 +89,6 @@ struct spi_geni_master { 
	int irq;

};



static void handle_fifo_timeout(struct spi_master *spi,

				struct spi_message *msg);



static int get_spi_clk_cfg(unsigned int speed_hz,

			struct spi_geni_master *mas,

			unsigned int *clk_idx,
@@ -122,6 +119,32 @@ static int get_spi_clk_cfg(unsigned int speed_hz, 
	return ret;

}



static void handle_fifo_timeout(struct spi_master *spi,

				struct spi_message *msg)

{

	struct spi_geni_master *mas = spi_master_get_devdata(spi);

	unsigned long time_left, flags;

	struct geni_se *se = &mas->se;



	spin_lock_irqsave(&mas->lock, flags);

	reinit_completion(&mas->xfer_done);

	mas->cur_mcmd = CMD_CANCEL;

	geni_se_cancel_m_cmd(se);

	writel(0, se->base + SE_GENI_TX_WATERMARK_REG);

	spin_unlock_irqrestore(&mas->lock, flags);

	time_left = wait_for_completion_timeout(&mas->xfer_done, HZ);

	if (time_left)

		return;



	spin_lock_irqsave(&mas->lock, flags);

	reinit_completion(&mas->xfer_done);

	geni_se_abort_m_cmd(se);

	spin_unlock_irqrestore(&mas->lock, flags);

	time_left = wait_for_completion_timeout(&mas->xfer_done, HZ);

	if (!time_left)

		dev_err(mas->dev, "Failed to cancel/abort m_cmd\n");

}



static void spi_geni_set_cs(struct spi_device *slv, bool set_flag)

{

	struct spi_geni_master *mas = spi_master_get_devdata(slv->master);
@@ -356,32 +379,6 @@ static void setup_fifo_xfer(struct spi_transfer *xfer, 
		writel(mas->tx_wm, se->base + SE_GENI_TX_WATERMARK_REG);

}



static void handle_fifo_timeout(struct spi_master *spi,

				struct spi_message *msg)

{

	struct spi_geni_master *mas = spi_master_get_devdata(spi);

	unsigned long time_left, flags;

	struct geni_se *se = &mas->se;



	spin_lock_irqsave(&mas->lock, flags);

	reinit_completion(&mas->xfer_done);

	mas->cur_mcmd = CMD_CANCEL;

	geni_se_cancel_m_cmd(se);

	writel(0, se->base + SE_GENI_TX_WATERMARK_REG);

	spin_unlock_irqrestore(&mas->lock, flags);

	time_left = wait_for_completion_timeout(&mas->xfer_done, HZ);

	if (time_left)

		return;



	spin_lock_irqsave(&mas->lock, flags);

	reinit_completion(&mas->xfer_done);

	geni_se_abort_m_cmd(se);

	spin_unlock_irqrestore(&mas->lock, flags);

	time_left = wait_for_completion_timeout(&mas->xfer_done, HZ);

	if (!time_left)

		dev_err(mas->dev, "Failed to cancel/abort m_cmd\n");

}



static int spi_geni_transfer_one(struct spi_master *spi,

				struct spi_device *slv,

				struct spi_transfer *xfer)