* [RESEND][PATCH 1/2] spi: qup: Remove spi_master_put in spi_qup_remove @ 2014-02-21 1:33 Axel Lin 2014-02-21 1:34 ` [RESEND][PATCH 2/2] spi: qup: Convert ot let spi core handle checking transfer speed Axel Lin 2014-02-23 3:28 ` [RESEND][PATCH 1/2] spi: qup: Remove spi_master_put in spi_qup_remove Mark Brown 0 siblings, 2 replies; 3+ messages in thread From: Axel Lin @ 2014-02-21 1:33 UTC (permalink / raw) To: Mark Brown; +Cc: Ivan T. Ivanov, linux-spi-u79uwXL29TY76Z2rM5mHXA This driver uses devm_spi_register_master() so don't explicitly call spi_master_put() in spi_qup_remove(). Signed-off-by: Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org> --- drivers/spi/spi-qup.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index b0bcc09..5edc56f 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -802,7 +802,6 @@ static int spi_qup_remove(struct platform_device *pdev) pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); - spi_master_put(master); return 0; } -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [RESEND][PATCH 2/2] spi: qup: Convert ot let spi core handle checking transfer speed 2014-02-21 1:33 [RESEND][PATCH 1/2] spi: qup: Remove spi_master_put in spi_qup_remove Axel Lin @ 2014-02-21 1:34 ` Axel Lin 2014-02-23 3:28 ` [RESEND][PATCH 1/2] spi: qup: Remove spi_master_put in spi_qup_remove Mark Brown 1 sibling, 0 replies; 3+ messages in thread From: Axel Lin @ 2014-02-21 1:34 UTC (permalink / raw) To: Mark Brown; +Cc: Ivan T. Ivanov, linux-spi-u79uwXL29TY76Z2rM5mHXA Set master->max_speed_hz then spi core will handle checking transfer speed. So we can remove the same checking in this driver. Also remove checking spi->chip_select in spi_qup_setup(), the checking is done by spi core. Signed-off-by: Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org> --- drivers/spi/spi-qup.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 5edc56f..dec339d 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -134,7 +134,6 @@ struct spi_qup { struct clk *cclk; /* core clock */ struct clk *iclk; /* interface clock */ int irq; - u32 max_speed_hz; spinlock_t lock; int in_fifo_sz; @@ -517,18 +516,6 @@ static int spi_qup_setup(struct spi_device *spi) struct spi_qup *controller = spi_master_get_devdata(spi->master); struct spi_qup_device *chip = spi_get_ctldata(spi); - if (spi->chip_select >= spi->master->num_chipselect) { - dev_err(controller->dev, "invalid chip_select %d\n", - spi->chip_select); - return -EINVAL; - } - - if (spi->max_speed_hz > controller->max_speed_hz) { - dev_err(controller->dev, "invalid max_speed_hz %d\n", - spi->max_speed_hz); - return -EINVAL; - } - if (!chip) { /* First setup */ chip = kzalloc(sizeof(*chip), GFP_KERNEL); @@ -629,6 +616,7 @@ static int spi_qup_probe(struct platform_device *pdev) master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; master->num_chipselect = SPI_NUM_CHIPSELECTS; master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32); + master->max_speed_hz = max_freq; master->setup = spi_qup_setup; master->cleanup = spi_qup_cleanup; master->set_cs = spi_qup_set_cs; @@ -645,7 +633,6 @@ static int spi_qup_probe(struct platform_device *pdev) controller->iclk = iclk; controller->cclk = cclk; controller->irq = irq; - controller->max_speed_hz = max_freq; spin_lock_init(&controller->lock); init_completion(&controller->done); -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RESEND][PATCH 1/2] spi: qup: Remove spi_master_put in spi_qup_remove 2014-02-21 1:33 [RESEND][PATCH 1/2] spi: qup: Remove spi_master_put in spi_qup_remove Axel Lin 2014-02-21 1:34 ` [RESEND][PATCH 2/2] spi: qup: Convert ot let spi core handle checking transfer speed Axel Lin @ 2014-02-23 3:28 ` Mark Brown 1 sibling, 0 replies; 3+ messages in thread From: Mark Brown @ 2014-02-23 3:28 UTC (permalink / raw) To: Axel Lin; +Cc: Ivan T. Ivanov, linux-spi-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 192 bytes --] On Fri, Feb 21, 2014 at 09:33:16AM +0800, Axel Lin wrote: > This driver uses devm_spi_register_master() so don't explicitly call > spi_master_put() in spi_qup_remove(). Applied both, thanks. [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-23 3:28 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-02-21 1:33 [RESEND][PATCH 1/2] spi: qup: Remove spi_master_put in spi_qup_remove Axel Lin 2014-02-21 1:34 ` [RESEND][PATCH 2/2] spi: qup: Convert ot let spi core handle checking transfer speed Axel Lin 2014-02-23 3:28 ` [RESEND][PATCH 1/2] spi: qup: Remove spi_master_put in spi_qup_remove Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).