spi: pxa2xx: No need to keep pointer to platform device
Subsystems (7)
Andy Shevchenko
reviewerPATCH 1/5 spi: pxa2xx: No need to keep pointer to platform device
There is no need to keep a pointer to the platform device. Currently there are no users of it directly, and if there will be in the future we may restore it from pointer to the struct device.
Convert all users at the same time.
--- arch/arm/plat-pxa/ssp.c | 4 ++-- drivers/spi/spi-pxa2xx.c | 2 +- include/linux/pxa2xx_ssp.h | 2 +- sound/soc/pxa/mmp-sspa.c | 2 +- sound/soc/pxa/pxa-ssp.c | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/plat-pxa/ssp.c +2 -2
@@ -89,7 +89,7 @@ void pxa_ssp_free(struct ssp_device *ssp) ssp->use_count--; ssp->label =NULL ; }else -dev_err (&ssp->pdev->dev,"device already free\n" ); +dev_err (ssp->dev,"device already free\n" );mutex_unlock (&ssp_lock); }EXPORT_SYMBOL (pxa_ssp_free);
@@ -118,7 +118,7 @@ static int pxa_ssp_probe(struct platform_device *pdev)if (ssp ==NULL )return -ENOMEM ; - ssp->pdev = pdev; + ssp->dev = dev; ssp->clk =devm_clk_get (dev,NULL );if (IS_ERR (ssp->clk))
drivers/spi/spi-pxa2xx.c +1 -1
@@ -1567,7 +1567,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) ssp->clk =devm_clk_get (&pdev->dev,NULL ); ssp->irq =platform_get_irq (pdev,0 ); ssp->type = type; - ssp->pdev = pdev; + ssp->dev = &pdev->dev; ssp->port_id =pxa2xx_spi_get_port_id (adev); pdata->is_slave =of_property_read_bool (pdev->dev.of_node,"spi-slave" );
include/linux/pxa2xx_ssp.h +1 -1
@@ -206,7 +206,7 @@ enum pxa_ssp_type { };struct ssp_device { -struct platform_device *pdev; +struct device *dev;struct list_head node;struct clk *clk;
sound/soc/pxa/mmp-sspa.c +1 -1
@@ -177,7 +177,7 @@ static int mmp_sspa_set_dai_fmt(struct snd_soc_dai *cpu_dai,/* we can only change the settings if the port is not in use */ if ((mmp_sspa_read_reg (sspa,SSPA_TXSP ) &SSPA_SP_S_EN ) || (mmp_sspa_read_reg (sspa,SSPA_RXSP ) &SSPA_SP_S_EN )) { -dev_err (&sspa->pdev->dev, +dev_err (sspa->dev,"can't change hardware dai format: stream is in use\n" );return -EINVAL ; }
sound/soc/pxa/pxa-ssp.c +5 -5
@@ -52,11 +52,11 @@ struct ssp_priv {static void dump_registers (struct ssp_device *ssp) { -dev_dbg (&ssp->pdev->dev,"SSCR0 0x%08x SSCR1 0x%08x SSTO 0x%08x\n" , +dev_dbg (ssp->dev,"SSCR0 0x%08x SSCR1 0x%08x SSTO 0x%08x\n" ,pxa_ssp_read_reg (ssp,SSCR0 ),pxa_ssp_read_reg (ssp,SSCR1 ),pxa_ssp_read_reg (ssp,SSTO )); -dev_dbg (&ssp->pdev->dev,"SSPSP 0x%08x SSSR 0x%08x SSACD 0x%08x\n" , +dev_dbg (ssp->dev,"SSPSP 0x%08x SSSR 0x%08x SSACD 0x%08x\n" ,pxa_ssp_read_reg (ssp,SSPSP ),pxa_ssp_read_reg (ssp,SSSR ),pxa_ssp_read_reg (ssp,SSACD )); }
@@ -223,7 +223,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, clk_id =PXA_SSP_CLK_EXT ; } -dev_dbg (&ssp->pdev->dev, +dev_dbg (ssp->dev,"pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %u\n" , cpu_dai->id, clk_id, freq);
@@ -316,7 +316,7 @@ static int pxa_ssp_set_pll(struct ssp_priv *priv, unsigned int freq) ssacd |= (0x6 <<4 ); -dev_dbg (&ssp->pdev->dev, +dev_dbg (ssp->dev,"Using SSACDD %x to supply %uHz\n" , val, freq);break ;
@@ -687,7 +687,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,* - complain loudly and fail if they've not been set up yet. */ if ((sscr0 &SSCR0_MOD ) && !ttsa) { -dev_err (&ssp->pdev->dev,"No TDM timeslot configured\n" ); +dev_err (ssp->dev,"No TDM timeslot configured\n" );return -EINVAL ; }
Signature · 1 line
2.23.0
Andy Shevchenko
reviewerPATCH 2/5 spi: pxa2xx: Sort headers
Sort the headers in alphabetic order in order to ease the maintenance for this part.
--- drivers/spi/spi-pxa2xx.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/spi/spi-pxa2xx.c +12 -12
@@ -4,27 +4,27 @@* Copyright (C) 2013, Intel Corporation */ +#include <linux/acpi.h> #include <linux/bitops.h> -#include <linux/init.h> -#include <linux/module.h> +#include <linux/clk.h> +#include <linux/delay.h> #include <linux/device.h> -#include <linux/ioport.h> -#include <linux/errno.h> #include <linux/err.h> +#include <linux/errno.h> +#include <linux/gpio/consumer.h> +#include <linux/gpio.h> +#include <linux/init.h> #include <linux/interrupt.h> +#include <linux/ioport.h> #include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_device.h> #include <linux/pci.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/slab.h> #include <linux/spi/pxa2xx_spi.h> #include <linux/spi/spi.h> -#include <linux/delay.h> -#include <linux/gpio.h> -#include <linux/gpio/consumer.h> -#include <linux/slab.h> -#include <linux/clk.h> -#include <linux/pm_runtime.h> -#include <linux/acpi.h> -#include <linux/of_device.h> #include "spi-pxa2xx.h"
Signature · 1 line
2.23.0
Mark Brown
maintainerApplied "spi: pxa2xx: Sort headers" to the spi tree
The patch
spi: pxa2xx: Sort headers
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.5
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
Quoted 1 line
From
5ce2570513bc012020e1faaa20333a6955845f06Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Fri, 18 Oct 2019 13:54:26 +0300
Subject: [PATCH] spi: pxa2xx: Sort headers
Sort the headers in alphabetic order in order to ease the maintenance for this part.
--- drivers/spi/spi-pxa2xx.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/spi/spi-pxa2xx.c +12 -12
@@ -4,27 +4,27 @@* Copyright (C) 2013, Intel Corporation */ +#include <linux/acpi.h> #include <linux/bitops.h> -#include <linux/init.h> -#include <linux/module.h> +#include <linux/clk.h> +#include <linux/delay.h> #include <linux/device.h> -#include <linux/ioport.h> -#include <linux/errno.h> #include <linux/err.h> +#include <linux/errno.h> +#include <linux/gpio/consumer.h> +#include <linux/gpio.h> +#include <linux/init.h> #include <linux/interrupt.h> +#include <linux/ioport.h> #include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_device.h> #include <linux/pci.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/slab.h> #include <linux/spi/pxa2xx_spi.h> #include <linux/spi/spi.h> -#include <linux/delay.h> -#include <linux/gpio.h> -#include <linux/gpio/consumer.h> -#include <linux/slab.h> -#include <linux/clk.h> -#include <linux/pm_runtime.h> -#include <linux/acpi.h> -#include <linux/of_device.h> #include "spi-pxa2xx.h"
Signature · 1 line
2.20.1
Andy Shevchenko
reviewerPATCH 3/5 spi: pxa2xx: Convert pxa2xx_spi_get_port_id() to take struct device
In reply to Andy ShevchenkoThis is preparatory patch before converting to use device_get_match_data() API.
--- drivers/spi/spi-pxa2xx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/spi/spi-pxa2xx.c +5 -3
@@ -1476,11 +1476,13 @@ MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match);#ifdef CONFIG_ACPI -static int pxa2xx_spi_get_port_id (struct acpi_device *adev) +static int pxa2xx_spi_get_port_id (struct device *dev) { +struct acpi_device *adev;unsigned int devid;int port_id =-1 ; + adev =ACPI_COMPANION (dev);if (adev && adev->pnp.unique_id && !kstrtouint (adev->pnp.unique_id,0 , &devid)) port_id = devid;
@@ -1489,7 +1491,7 @@ static int pxa2xx_spi_get_port_id(struct acpi_device *adev)#else /* !CONFIG_ACPI */ -static int pxa2xx_spi_get_port_id (struct acpi_device *adev) +static int pxa2xx_spi_get_port_id (struct device *dev) {return -1 ; }
@@ -1568,7 +1570,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) ssp->irq =platform_get_irq (pdev,0 ); ssp->type = type; ssp->dev = &pdev->dev; - ssp->port_id =pxa2xx_spi_get_port_id (adev); + ssp->port_id =pxa2xx_spi_get_port_id (&pdev->dev); pdata->is_slave =of_property_read_bool (pdev->dev.of_node,"spi-slave" ); pdata->num_chipselect =1 ;
Signature · 1 line
2.23.0
Mark Brown
maintainerApplied "spi: pxa2xx: Convert pxa2xx_spi_get_port_id() to take struct device" to the spi tree
The patch
spi: pxa2xx: Convert pxa2xx_spi_get_port_id() to take struct device
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.5
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
Quoted 1 line
From
365e856e18b88e360388f9de4f5da0d5b332114bMon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Fri, 18 Oct 2019 13:54:27 +0300
Subject: [PATCH] spi: pxa2xx: Convert pxa2xx_spi_get_port_id() to take struct
device
This is preparatory patch before converting to use device_get_match_data() API.
--- drivers/spi/spi-pxa2xx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/spi/spi-pxa2xx.c +5 -3
@@ -1476,11 +1476,13 @@ MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match);#ifdef CONFIG_ACPI -static int pxa2xx_spi_get_port_id (struct acpi_device *adev) +static int pxa2xx_spi_get_port_id (struct device *dev) { +struct acpi_device *adev;unsigned int devid;int port_id =-1 ; + adev =ACPI_COMPANION (dev);if (adev && adev->pnp.unique_id && !kstrtouint (adev->pnp.unique_id,0 , &devid)) port_id = devid;
@@ -1489,7 +1491,7 @@ static int pxa2xx_spi_get_port_id(struct acpi_device *adev)#else /* !CONFIG_ACPI */ -static int pxa2xx_spi_get_port_id (struct acpi_device *adev) +static int pxa2xx_spi_get_port_id (struct device *dev) {return -1 ; }
@@ -1568,7 +1570,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) ssp->irq =platform_get_irq (pdev,0 ); ssp->type = type; ssp->dev = &pdev->dev; - ssp->port_id =pxa2xx_spi_get_port_id (adev); + ssp->port_id =pxa2xx_spi_get_port_id (&pdev->dev); pdata->is_slave =of_property_read_bool (pdev->dev.of_node,"spi-slave" ); pdata->num_chipselect =1 ;
Signature · 1 line
2.20.1
Andy Shevchenko
reviewerPATCH 4/5 spi: pxa2xx: Convert to use device_get_match_data()
In reply to Andy ShevchenkoConvert to use device_get_match_data() instead of open coded variant.
While here, switch of_property_read_bool() to device_property_read_bool().
--- drivers/spi/spi-pxa2xx.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-)
drivers/spi/spi-pxa2xx.c +7 -19
@@ -22,6 +22,7 @@#include <linux/pci.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <linux/slab.h> #include <linux/spi/pxa2xx_spi.h> #include <linux/spi/spi.h>
@@ -1512,34 +1513,21 @@ static struct pxa2xx_spi_controller * pxa2xx_spi_init_pdata(struct platform_device *pdev) {struct pxa2xx_spi_controller *pdata; -struct acpi_device *adev;struct ssp_device *ssp;struct resource *res; -const struct acpi_device_id *adev_id =NULL ;const struct pci_device_id *pcidev_id =NULL ; -const struct of_device_id *of_id =NULL ;enum pxa_ssp_type type; +const void *match; - adev =ACPI_COMPANION (&pdev->dev); - -if (pdev->dev.of_node) - of_id =of_match_device (pdev->dev.driver->of_match_table, - &pdev->dev); -else if (dev_is_pci (pdev->dev.parent)) +if (dev_is_pci (pdev->dev.parent)) pcidev_id =pci_match_id (pxa2xx_spi_pci_compound_match,to_pci_dev (pdev->dev.parent)); -else if (adev) - adev_id =acpi_match_device (pdev->dev.driver->acpi_match_table, - &pdev->dev); -else -return NULL ; -if (adev_id) - type = (enum pxa_ssp_type )adev_id->driver_data; + match =device_get_match_data (&pdev->dev); +if (match) + type = (enum pxa_ssp_type )match;else if (pcidev_id) type = (enum pxa_ssp_type )pcidev_id->driver_data; -else if (of_id) - type = (enum pxa_ssp_type )of_id->data;else return NULL ;
@@ -1572,7 +1560,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) ssp->dev = &pdev->dev; ssp->port_id =pxa2xx_spi_get_port_id (&pdev->dev); - pdata->is_slave =of_property_read_bool (pdev->dev.of_node,"spi-slave" ); + pdata->is_slave =device_property_read_bool (&pdev->dev,"spi-slave" ); pdata->num_chipselect =1 ; pdata->enable_dma = true; pdata->dma_burst_size =1 ;
Signature · 1 line
2.23.0
Mark Brown
maintainerApplied "spi: pxa2xx: Convert to use device_get_match_data()" to the spi tree
The patch
spi: pxa2xx: Convert to use device_get_match_data()
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.5
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
Quoted 1 line
From
f2faa3ec79ac11db8c26b10f8c978d4d0f7392ddMon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Fri, 18 Oct 2019 13:54:28 +0300
Subject: [PATCH] spi: pxa2xx: Convert to use device_get_match_data()
Convert to use device_get_match_data() instead of open coded variant.
While here, switch of_property_read_bool() to device_property_read_bool().
--- drivers/spi/spi-pxa2xx.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-)
drivers/spi/spi-pxa2xx.c +7 -19
@@ -22,6 +22,7 @@#include <linux/pci.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <linux/slab.h> #include <linux/spi/pxa2xx_spi.h> #include <linux/spi/spi.h>
@@ -1512,34 +1513,21 @@ static struct pxa2xx_spi_controller * pxa2xx_spi_init_pdata(struct platform_device *pdev) {struct pxa2xx_spi_controller *pdata; -struct acpi_device *adev;struct ssp_device *ssp;struct resource *res; -const struct acpi_device_id *adev_id =NULL ;const struct pci_device_id *pcidev_id =NULL ; -const struct of_device_id *of_id =NULL ;enum pxa_ssp_type type; +const void *match; - adev =ACPI_COMPANION (&pdev->dev); - -if (pdev->dev.of_node) - of_id =of_match_device (pdev->dev.driver->of_match_table, - &pdev->dev); -else if (dev_is_pci (pdev->dev.parent)) +if (dev_is_pci (pdev->dev.parent)) pcidev_id =pci_match_id (pxa2xx_spi_pci_compound_match,to_pci_dev (pdev->dev.parent)); -else if (adev) - adev_id =acpi_match_device (pdev->dev.driver->acpi_match_table, - &pdev->dev); -else -return NULL ; -if (adev_id) - type = (enum pxa_ssp_type )adev_id->driver_data; + match =device_get_match_data (&pdev->dev); +if (match) + type = (enum pxa_ssp_type )match;else if (pcidev_id) type = (enum pxa_ssp_type )pcidev_id->driver_data; -else if (of_id) - type = (enum pxa_ssp_type )of_id->data;else return NULL ;
@@ -1572,7 +1560,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) ssp->dev = &pdev->dev; ssp->port_id =pxa2xx_spi_get_port_id (&pdev->dev); - pdata->is_slave =of_property_read_bool (pdev->dev.of_node,"spi-slave" ); + pdata->is_slave =device_property_read_bool (&pdev->dev,"spi-slave" ); pdata->num_chipselect =1 ; pdata->enable_dma = true; pdata->dma_burst_size =1 ;
Signature · 1 line
2.20.1
Andy Shevchenko
reviewerPATCH 5/5 spi: pxa2xx: Replace of_device.h with mod_devicetable.h and of.h
In reply to Andy ShevchenkoThere is nothing in use from of_device.h. The definitions and macros are available thru mod_devicetable.h and of.h.
--- drivers/spi/spi-pxa2xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-pxa2xx.c +2 -1
@@ -18,7 +18,8 @@#include <linux/ioport.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/mod_devicetable.h> +#include <linux/of.h> #include <linux/pci.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h>
Signature · 1 line
2.23.0
Mark Brown
maintainerApplied "spi: pxa2xx: Replace of_device.h with mod_devicetable.h and of.h" to the spi tree
The patch
spi: pxa2xx: Replace of_device.h with mod_devicetable.h and of.h
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.5
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
Quoted 1 line
From
ae8fbf1d2403bc187a5d8fe82fbf2205d89cdb60Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Fri, 18 Oct 2019 13:54:29 +0300
Subject: [PATCH] spi: pxa2xx: Replace of_device.h with mod_devicetable.h and
of.h
There is nothing in use from of_device.h. The definitions and macros are available thru mod_devicetable.h and of.h.
--- drivers/spi/spi-pxa2xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-pxa2xx.c +2 -1
@@ -18,7 +18,8 @@#include <linux/ioport.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/mod_devicetable.h> +#include <linux/of.h> #include <linux/pci.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h>
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "spi: pxa2xx: No need to keep pointer to platform device" to the spi tree
In reply to Andy ShevchenkoThe patch
spi: pxa2xx: No need to keep pointer to platform device
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.5
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
Quoted 1 line
From
4f3d957718e7f0ac2b033dbf48c7cddecd0a8dd3Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Fri, 18 Oct 2019 13:54:25 +0300
Subject: [PATCH] spi: pxa2xx: No need to keep pointer to platform device
There is no need to keep a pointer to the platform device. Currently there are no users of it directly, and if there will be in the future we may restore it from pointer to the struct device.
Convert all users at the same time.
--- arch/arm/plat-pxa/ssp.c | 4 ++-- drivers/spi/spi-pxa2xx.c | 2 +- include/linux/pxa2xx_ssp.h | 2 +- sound/soc/pxa/mmp-sspa.c | 2 +- sound/soc/pxa/pxa-ssp.c | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/plat-pxa/ssp.c +2 -2
@@ -89,7 +89,7 @@ void pxa_ssp_free(struct ssp_device *ssp) ssp->use_count--; ssp->label =NULL ; }else -dev_err (&ssp->pdev->dev,"device already free\n" ); +dev_err (ssp->dev,"device already free\n" );mutex_unlock (&ssp_lock); }EXPORT_SYMBOL (pxa_ssp_free);
@@ -118,7 +118,7 @@ static int pxa_ssp_probe(struct platform_device *pdev)if (ssp ==NULL )return -ENOMEM ; - ssp->pdev = pdev; + ssp->dev = dev; ssp->clk =devm_clk_get (dev,NULL );if (IS_ERR (ssp->clk))
drivers/spi/spi-pxa2xx.c +1 -1
@@ -1567,7 +1567,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) ssp->clk =devm_clk_get (&pdev->dev,NULL ); ssp->irq =platform_get_irq (pdev,0 ); ssp->type = type; - ssp->pdev = pdev; + ssp->dev = &pdev->dev; ssp->port_id =pxa2xx_spi_get_port_id (adev); pdata->is_slave =of_property_read_bool (pdev->dev.of_node,"spi-slave" );
include/linux/pxa2xx_ssp.h +1 -1
@@ -206,7 +206,7 @@ enum pxa_ssp_type { };struct ssp_device { -struct platform_device *pdev; +struct device *dev;struct list_head node;struct clk *clk;
sound/soc/pxa/mmp-sspa.c +1 -1
@@ -177,7 +177,7 @@ static int mmp_sspa_set_dai_fmt(struct snd_soc_dai *cpu_dai,/* we can only change the settings if the port is not in use */ if ((mmp_sspa_read_reg (sspa,SSPA_TXSP ) &SSPA_SP_S_EN ) || (mmp_sspa_read_reg (sspa,SSPA_RXSP ) &SSPA_SP_S_EN )) { -dev_err (&sspa->pdev->dev, +dev_err (sspa->dev,"can't change hardware dai format: stream is in use\n" );return -EINVAL ; }
sound/soc/pxa/pxa-ssp.c +5 -5
@@ -52,11 +52,11 @@ struct ssp_priv {static void dump_registers (struct ssp_device *ssp) { -dev_dbg (&ssp->pdev->dev,"SSCR0 0x%08x SSCR1 0x%08x SSTO 0x%08x\n" , +dev_dbg (ssp->dev,"SSCR0 0x%08x SSCR1 0x%08x SSTO 0x%08x\n" ,pxa_ssp_read_reg (ssp,SSCR0 ),pxa_ssp_read_reg (ssp,SSCR1 ),pxa_ssp_read_reg (ssp,SSTO )); -dev_dbg (&ssp->pdev->dev,"SSPSP 0x%08x SSSR 0x%08x SSACD 0x%08x\n" , +dev_dbg (ssp->dev,"SSPSP 0x%08x SSSR 0x%08x SSACD 0x%08x\n" ,pxa_ssp_read_reg (ssp,SSPSP ),pxa_ssp_read_reg (ssp,SSSR ),pxa_ssp_read_reg (ssp,SSACD )); }
@@ -223,7 +223,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, clk_id =PXA_SSP_CLK_EXT ; } -dev_dbg (&ssp->pdev->dev, +dev_dbg (ssp->dev,"pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %u\n" , cpu_dai->id, clk_id, freq);
@@ -316,7 +316,7 @@ static int pxa_ssp_set_pll(struct ssp_priv *priv, unsigned int freq) ssacd |= (0x6 <<4 ); -dev_dbg (&ssp->pdev->dev, +dev_dbg (ssp->dev,"Using SSACDD %x to supply %uHz\n" , val, freq);break ;
@@ -687,7 +687,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,* - complain loudly and fail if they've not been set up yet. */ if ((sscr0 &SSCR0_MOD ) && !ttsa) { -dev_err (&ssp->pdev->dev,"No TDM timeslot configured\n" ); +dev_err (ssp->dev,"No TDM timeslot configured\n" );return -EINVAL ; }
Signature · 1 line
2.20.1