From c70c7284a058b0c1855d945027d0bb39acd21f5d Mon Sep 17 00:00:00 2001 From: Fabian Krueger Date: Wed, 26 Jun 2019 09:35:20 +0200 Subject: [PATCH] staging: kpc2000: blank lines after declaration After the declarations in a function, there should be a blank line, so that the declaration part is visibly separated from the rest. This refactoring makes the code more readable. Signed-off-by: Fabian Krueger Signed-off-by: Michael Scheiderer Cc: Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- drivers/staging/kpc2000/kpc2000_spi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/staging/kpc2000/kpc2000_spi.c b/drivers/staging/kpc2000/kpc2000_spi.c index 6812d27764e2..30073440189e 100644 --- a/drivers/staging/kpc2000/kpc2000_spi.c +++ b/drivers/staging/kpc2000/kpc2000_spi.c @@ -176,6 +176,7 @@ kp_spi_read_reg(struct kp_spi_controller_state *cs, int idx) kp_spi_write_reg(struct kp_spi_controller_state *cs, int idx, u64 val) { u64 __iomem *addr = cs->base; + addr += idx; writeq(val, addr); if (idx == KP_SPI_REG_CONFIG) @@ -187,6 +188,7 @@ kp_spi_wait_for_reg_bit(struct kp_spi_controller_state *cs, int idx, unsigned long bit) { unsigned long timeout; + timeout = jiffies + msecs_to_jiffies(1000); while (!(kp_spi_read_reg(cs, idx) & bit)) { if (time_after(jiffies, timeout)) { @@ -416,6 +418,7 @@ kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m) kp_spi_cleanup(struct spi_device *spidev) { struct kp_spi_controller_state *cs = spidev->controller_state; + if (cs) { kfree(cs); } @@ -507,6 +510,7 @@ kp_spi_probe(struct platform_device *pldev) kp_spi_remove(struct platform_device *pldev) { struct spi_master *master = platform_get_drvdata(pldev); + spi_unregister_master(master); return 0; }