[2/3] spi: modify set_cs_timing parameter

Commit Message

Mason Zhang July 19, 2021, 9:16 a.m. UTC

From: Mason Zhang <[e-mail]>

No need pass in spi_delay to set_cs_timing callback.

Signed-off-by: Mason Zhang <[e-mail]>
---
 include/linux/spi/spi.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Mark Brown Aug. 2, 2021, 8:16 p.m. UTC | #1

On Mon, Jul 19, 2021 at 05:16:43PM +0800, Mason Zhang wrote:
> From: Mason Zhang <[e-mail]>
> 
> No need pass in spi_delay to set_cs_timing callback.

This breaks the build:

/mnt/kernel/drivers/spi/spi-tegra114.c: In function 'tegra_spi_probe':
/mnt/kernel/drivers/spi/spi-tegra114.c:1328:24: error: assignment to 'int (*)(struct spi_device *)' from incompatible pointer type 'int (*)(struct spi_device *, struct spi_delay *, struct spi_delay *, struct spi_delay *)' [-Werror=incompatible-pointer-types]
  master->set_cs_timing = tegra_spi_set_hw_cs_timing;
                        ^

Mason Zhang Aug. 3, 2021, 3:14 a.m. UTC | #2

On Mon, 2021-08-02 at 21:16 +0100, Mark Brown wrote:
> On Mon, Jul 19, 2021 at 05:16:43PM +0800, Mason Zhang wrote:
> > From: Mason Zhang <[e-mail]>
> > 
> > No need pass in spi_delay to set_cs_timing callback.
> 
> This breaks the build:
> 
> /mnt/kernel/drivers/spi/spi-tegra114.c: In function 'tegra_spi_probe':
> /mnt/kernel/drivers/spi/spi-tegra114.c:1328:24: error: assignment to 'int (*)(struct spi_device *)' from incompatible pointer type 'int (*)(struct spi_device *, struct spi_delay *, struct spi_delay *, struct spi_delay *)' [-Werror=incompatible-pointer-types]
>   master->set_cs_timing = tegra_spi_set_hw_cs_timing;
>                         ^

Dear Mark:

	I have fixed this build err in this patch:

https://lore.kernel.org/linux-spi/[e-mail]/T/#u


Thanks
Mason

Mason Zhang Aug. 3, 2021, 10:52 a.m. UTC | #3

On Tue, 2021-08-03 at 11:14 +0800, Mason Zhang wrote:
> Dear Mark:
> 
> 	I have fixed this build err in this patch:
> 
> https://lore.kernel.org/linux-spi/[e-mail]/T/#u
> 
> 
> Thanks
> Mason

Dear Mark:

	I have submit this change separately, but still have build err, so I
have updated the patch v2 as below:

https://lore.kernel.org/linux-spi/[e-mail]/T/#u

Thanks
Mason

Mark Brown Aug. 6, 2021, 12:47 a.m. UTC | #4

On Mon, 19 Jul 2021 17:16:43 +0800, Mason Zhang wrote:
> No need pass in spi_delay to set_cs_timing callback.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[2/3] spi: modify set_cs_timing parameter
      commit: 04e6bb0d6bb127bac929fb35edd2dd01613c9520

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Patch

diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 651e19ba3415..fe027efb85c2 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -553,8 +553,7 @@  struct spi_controller {
 	 * to configure specific CS timing through spi_set_cs_timing() after
 	 * spi_setup().
 	 */
-	int (*set_cs_timing)(struct spi_device *spi, struct spi_delay *setup,
-			     struct spi_delay *hold, struct spi_delay *inactive);
+	int (*set_cs_timing)(struct spi_device *spi);
 
 	/* bidirectional bulk transfers
 	 *