Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Stephen Boyd and committed by
Mark Brown
de43affe 0357a3da

+26 -29
+26 -29
drivers/spi/spi-geni-qcom.c
··· 89 89 int irq; 90 90 }; 91 91 92 - static void handle_fifo_timeout(struct spi_master *spi, 93 - struct spi_message *msg); 94 - 95 92 static int get_spi_clk_cfg(unsigned int speed_hz, 96 93 struct spi_geni_master *mas, 97 94 unsigned int *clk_idx, ··· 117 120 if (ret) 118 121 dev_err(mas->dev, "clk_set_rate failed %d\n", ret); 119 122 return ret; 123 + } 124 + 125 + static void handle_fifo_timeout(struct spi_master *spi, 126 + struct spi_message *msg) 127 + { 128 + struct spi_geni_master *mas = spi_master_get_devdata(spi); 129 + unsigned long time_left, flags; 130 + struct geni_se *se = &mas->se; 131 + 132 + spin_lock_irqsave(&mas->lock, flags); 133 + reinit_completion(&mas->xfer_done); 134 + mas->cur_mcmd = CMD_CANCEL; 135 + geni_se_cancel_m_cmd(se); 136 + writel(0, se->base + SE_GENI_TX_WATERMARK_REG); 137 + spin_unlock_irqrestore(&mas->lock, flags); 138 + time_left = wait_for_completion_timeout(&mas->xfer_done, HZ); 139 + if (time_left) 140 + return; 141 + 142 + spin_lock_irqsave(&mas->lock, flags); 143 + reinit_completion(&mas->xfer_done); 144 + geni_se_abort_m_cmd(se); 145 + spin_unlock_irqrestore(&mas->lock, flags); 146 + time_left = wait_for_completion_timeout(&mas->xfer_done, HZ); 147 + if (!time_left) 148 + dev_err(mas->dev, "Failed to cancel/abort m_cmd\n"); 120 149 } 121 150 122 151 static void spi_geni_set_cs(struct spi_device *slv, bool set_flag) ··· 377 354 */ 378 355 if (m_cmd & SPI_TX_ONLY) 379 356 writel(mas->tx_wm, se->base + SE_GENI_TX_WATERMARK_REG); 380 - } 381 - 382 - static void handle_fifo_timeout(struct spi_master *spi, 383 - struct spi_message *msg) 384 - { 385 - struct spi_geni_master *mas = spi_master_get_devdata(spi); 386 - unsigned long time_left, flags; 387 - struct geni_se *se = &mas->se; 388 - 389 - spin_lock_irqsave(&mas->lock, flags); 390 - reinit_completion(&mas->xfer_done); 391 - mas->cur_mcmd = CMD_CANCEL; 392 - geni_se_cancel_m_cmd(se); 393 - writel(0, se->base + SE_GENI_TX_WATERMARK_REG); 394 - spin_unlock_irqrestore(&mas->lock, flags); 395 - time_left = wait_for_completion_timeout(&mas->xfer_done, HZ); 396 - if (time_left) 397 - return; 398 - 399 - spin_lock_irqsave(&mas->lock, flags); 400 - reinit_completion(&mas->xfer_done); 401 - geni_se_abort_m_cmd(se); 402 - spin_unlock_irqrestore(&mas->lock, flags); 403 - time_left = wait_for_completion_timeout(&mas->xfer_done, HZ); 404 - if (!time_left) 405 - dev_err(mas->dev, "Failed to cancel/abort m_cmd\n"); 406 357 } 407 358 408 359 static int spi_geni_transfer_one(struct spi_master *spi,