Commit 0dccff3c authored by Alok Chauhan's avatar Alok Chauhan Committed by Mark Brown

spi: spi-geni-qcom: fix nitpicks

fixed the nitpicks.
Signed-off-by: default avatarAlok Chauhan <alokc@codeaurora.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 13aed239
...@@ -64,15 +64,13 @@ ...@@ -64,15 +64,13 @@
#define TIMESTAMP_AFTER BIT(3) #define TIMESTAMP_AFTER BIT(3)
#define POST_CMD_DELAY BIT(4) #define POST_CMD_DELAY BIT(4)
/* SPI M_COMMAND OPCODE */ enum spi_m_cmd_opcode {
enum spi_mcmd_code {
CMD_NONE, CMD_NONE,
CMD_XFER, CMD_XFER,
CMD_CS, CMD_CS,
CMD_CANCEL, CMD_CANCEL,
}; };
struct spi_geni_master { struct spi_geni_master {
struct geni_se se; struct geni_se se;
struct device *dev; struct device *dev;
...@@ -87,7 +85,7 @@ struct spi_geni_master { ...@@ -87,7 +85,7 @@ struct spi_geni_master {
struct completion xfer_done; struct completion xfer_done;
unsigned int oversampling; unsigned int oversampling;
spinlock_t lock; spinlock_t lock;
unsigned int cur_mcmd; enum spi_m_cmd_opcode cur_mcmd;
int irq; int irq;
}; };
...@@ -129,7 +127,7 @@ static void spi_geni_set_cs(struct spi_device *slv, bool set_flag) ...@@ -129,7 +127,7 @@ static void spi_geni_set_cs(struct spi_device *slv, bool set_flag)
struct spi_geni_master *mas = spi_master_get_devdata(slv->master); struct spi_geni_master *mas = spi_master_get_devdata(slv->master);
struct spi_master *spi = dev_get_drvdata(mas->dev); struct spi_master *spi = dev_get_drvdata(mas->dev);
struct geni_se *se = &mas->se; struct geni_se *se = &mas->se;
unsigned long timeout; unsigned long time_left;
reinit_completion(&mas->xfer_done); reinit_completion(&mas->xfer_done);
pm_runtime_get_sync(mas->dev); pm_runtime_get_sync(mas->dev);
...@@ -142,8 +140,8 @@ static void spi_geni_set_cs(struct spi_device *slv, bool set_flag) ...@@ -142,8 +140,8 @@ static void spi_geni_set_cs(struct spi_device *slv, bool set_flag)
else else
geni_se_setup_m_cmd(se, SPI_CS_DEASSERT, 0); geni_se_setup_m_cmd(se, SPI_CS_DEASSERT, 0);
timeout = wait_for_completion_timeout(&mas->xfer_done, HZ); time_left = wait_for_completion_timeout(&mas->xfer_done, HZ);
if (!timeout) if (!time_left)
handle_fifo_timeout(spi, NULL); handle_fifo_timeout(spi, NULL);
pm_runtime_put(mas->dev); pm_runtime_put(mas->dev);
...@@ -485,7 +483,6 @@ static irqreturn_t geni_spi_isr(int irq, void *data) ...@@ -485,7 +483,6 @@ static irqreturn_t geni_spi_isr(int irq, void *data)
struct geni_se *se = &mas->se; struct geni_se *se = &mas->se;
u32 m_irq; u32 m_irq;
unsigned long flags; unsigned long flags;
irqreturn_t ret = IRQ_HANDLED;
if (mas->cur_mcmd == CMD_NONE) if (mas->cur_mcmd == CMD_NONE)
return IRQ_NONE; return IRQ_NONE;
...@@ -533,7 +530,7 @@ static irqreturn_t geni_spi_isr(int irq, void *data) ...@@ -533,7 +530,7 @@ static irqreturn_t geni_spi_isr(int irq, void *data)
writel(m_irq, se->base + SE_GENI_M_IRQ_CLEAR); writel(m_irq, se->base + SE_GENI_M_IRQ_CLEAR);
spin_unlock_irqrestore(&mas->lock, flags); spin_unlock_irqrestore(&mas->lock, flags);
return ret; return IRQ_HANDLED;
} }
static int spi_geni_probe(struct platform_device *pdev) static int spi_geni_probe(struct platform_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment