ASoC: xilinx: replace OF with device handlers
Subsystems (4)
PATCH 1/1 ASoC: xilinx: replace OF with device handlers
All of these usages of OF handlers use the node from the platform_device. Use the device member to simplify slightly.
--- sound/soc/xilinx/xlnx_formatter_pcm.c | 2 -- sound/soc/xilinx/xlnx_i2s.c | 12 +++++------- sound/soc/xilinx/xlnx_spdif.c | 8 +++----- 3 files changed, 8 insertions(+), 14 deletions(-)
sound/soc/xilinx/xlnx_formatter_pcm.c +0 -2
@@ -9,8 +9,6 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/module.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> #include <linux/sizes.h> #include <sound/asoundef.h>
sound/soc/xilinx/xlnx_i2s.c +5 -7
@@ -9,9 +9,8 @@#include <linux/io.h> #include <linux/module.h> -#include <linux/of.h> -#include <linux/of_platform.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <sound/pcm_params.h> #include <sound/soc.h>
@@ -174,7 +173,6 @@ static int xlnx_i2s_probe(struct platform_device *pdev)int ret;u32 format;struct device *dev = &pdev->dev; -struct device_node *node = dev->of_node; drv_data =devm_kzalloc (&pdev->dev,sizeof (*drv_data),GFP_KERNEL );if (!drv_data)
@@ -184,13 +182,13 @@ static int xlnx_i2s_probe(struct platform_device *pdev)if (IS_ERR (drv_data->base))return PTR_ERR (drv_data->base); - ret =of_property_read_u32 (node,"xlnx,num-channels" , &drv_data->channels); + ret =device_property_read_u32 (dev,"xlnx,num-channels" , &drv_data->channels);if (ret <0 )return dev_err_probe (dev, ret,"cannot get supported channels\n" ); drv_data->channels *=2 ; - ret =of_property_read_u32 (node,"xlnx,dwidth" , &drv_data->data_width); + ret =device_property_read_u32 (dev,"xlnx,dwidth" , &drv_data->data_width);if (ret <0 )return dev_err_probe (dev, ret,"cannot get data width\n" );
@@ -205,7 +203,7 @@ static int xlnx_i2s_probe(struct platform_device *pdev)return -EINVAL ; } -if (of_device_is_compatible (node,"xlnx,i2s-transmitter-1.0" )) { +if (device_is_compatible (dev,"xlnx,i2s-transmitter-1.0" )) { drv_data->dai_drv.name ="xlnx_i2s_playback" ; drv_data->dai_drv.playback.stream_name ="Playback" ; drv_data->dai_drv.playback.formats = format;
@@ -213,7 +211,7 @@ static int xlnx_i2s_probe(struct platform_device *pdev) drv_data->dai_drv.playback.channels_max = drv_data->channels; drv_data->dai_drv.playback.rates =SNDRV_PCM_RATE_8000_192000 ; drv_data->dai_drv.ops = &xlnx_i2s_dai_ops; - }else if (of_device_is_compatible (node,"xlnx,i2s-receiver-1.0" )) { + }else if (device_is_compatible (dev,"xlnx,i2s-receiver-1.0" )) { drv_data->dai_drv.name ="xlnx_i2s_capture" ; drv_data->dai_drv.capture.stream_name ="Capture" ; drv_data->dai_drv.capture.formats = format;
sound/soc/xilinx/xlnx_spdif.c +3 -5
@@ -10,8 +10,7 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/module.h> -#include <linux/of.h> -#include <linux/of_platform.h> +#include <linux/property.h> #include <linux/platform_device.h> #include <sound/pcm_params.h> #include <sound/soc.h>
@@ -242,7 +241,6 @@ static int xlnx_spdif_probe(struct platform_device *pdev)struct spdif_dev_data *ctx;struct device *dev = &pdev->dev; -struct device_node *node = dev->of_node; ctx =devm_kzalloc (dev,sizeof (*ctx),GFP_KERNEL );if (!ctx)
@@ -257,7 +255,7 @@ static int xlnx_spdif_probe(struct platform_device *pdev)if (IS_ERR (ctx->base))return PTR_ERR (ctx->base); - ret =of_property_read_u32 (node,"xlnx,spdif-mode" , &ctx->mode); + ret =device_property_read_u32 (dev,"xlnx,spdif-mode" , &ctx->mode);if (ret <0 )return dev_err_probe (dev, ret,"cannot get SPDIF mode\n" );
@@ -278,7 +276,7 @@ static int xlnx_spdif_probe(struct platform_device *pdev) dai_drv = &xlnx_spdif_rx_dai; } - ret =of_property_read_u32 (node,"xlnx,aud_clk_i" , &ctx->aclk); + ret =device_property_read_u32 (dev,"xlnx,aud_clk_i" , &ctx->aclk);if (ret <0 )return dev_err_probe (dev, ret,"cannot get aud_clk_i value\n" );
Signature · 1 line
2.55.0
Quoted 4 lines · Rosen Penev
All of these usages of OF handlers use the node from the
platform_device. Use the device member to simplify slightly.Signed-off-by Rosen Penev <[email protected]>
Thank you!
...
Mark Brown
maintainerQuoted 1 line · Rosen Penev
ASoC: xilinx: replace OF with device handlers
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.3
Thanks!
[1/1] ASoC: xilinx: replace OF with device handlers
https://git.kernel.org/broonie/sound/c/99ddfbba9e71
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