Re: [PATCH v9 4/5] staging: bcm2835-audio: Register bcm2835-audio with vchiq_bus_type

[Stefan Wahren]

Hi Umang,

Am 19.07.23 um 18:44 schrieb Umang Jain:
> Similar to how bcm2385-camera device is registered, register the
> bcm2835-audio with vchiq_bus_type as well.
>
> Signed-off-by: Umang Jain <umang.jain@xxxxxxxxxxxxxxxx>
> ---
>   .../vc04_services/bcm2835-audio/bcm2835.c     | 20 +++++++++----------
>   .../interface/vchiq_arm/vchiq_arm.c           |  6 +++---
>   2 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
> index 00bc898b0189..70e5e0942743 100644
> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
> @@ -1,12 +1,12 @@
>   // SPDX-License-Identifier: GPL-2.0
>   /* Copyright 2011 Broadcom Corporation.  All rights reserved. */
>   
> -#include <linux/platform_device.h>
> -
>   #include <linux/init.h>
>   #include <linux/slab.h>
>   #include <linux/module.h>
>   
> +#include "../interface/vchiq_arm/vchiq_arm.h"
> +#include "../interface/vchiq_arm/vchiq_device.h"
>   #include "bcm2835.h"
>   
>   static bool enable_hdmi;
> @@ -268,9 +268,9 @@ static int snd_add_child_devices(struct device *device, u32 numchans)
>   	return 0;
>   }
>   
> -static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
> +static int snd_bcm2835_alsa_probe(struct vchiq_device *device)
>   {
> -	struct device *dev = &pdev->dev;
> +	struct device *dev = &device->dev;
>   	int err;
>   
>   	if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) {
> @@ -292,32 +292,32 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
>   
>   #ifdef CONFIG_PM
>   
> -static int snd_bcm2835_alsa_suspend(struct platform_device *pdev,
> +static int snd_bcm2835_alsa_suspend(struct vchiq_device *device,
>   				    pm_message_t state)
>   {
>   	return 0;
>   }
>   
> -static int snd_bcm2835_alsa_resume(struct platform_device *pdev)
> +static int snd_bcm2835_alsa_resume(struct vchiq_device *device)
>   {
>   	return 0;
>   }
>   
>   #endif
>   
> -static struct platform_driver bcm2835_alsa_driver = {
> +static struct vchiq_driver bcm2835_alsa_driver = {
>   	.probe = snd_bcm2835_alsa_probe,
>   #ifdef CONFIG_PM
>   	.suspend = snd_bcm2835_alsa_suspend,
>   	.resume = snd_bcm2835_alsa_resume,
>   #endif
>   	.driver = {
> -		.name = "bcm2835_audio",
> +		.name = "bcm2835-audio",

At least this change is not mentioned in the commit log.

Thanks

>   	},
>   };
> -module_platform_driver(bcm2835_alsa_driver);
> +module_vchiq_driver(bcm2835_alsa_driver);
>   
>   MODULE_AUTHOR("Dom Cobley");
>   MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
>   MODULE_LICENSE("GPL");
> -MODULE_ALIAS("platform:bcm2835_audio");
> +MODULE_ALIAS("bcm2835-audio");
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> index d941e9640415..f7c2dce5ab09 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> @@ -67,12 +67,12 @@ int vchiq_susp_log_level = VCHIQ_LOG_ERROR;
>   DEFINE_SPINLOCK(msg_queue_spinlock);
>   struct vchiq_state g_state;
>   
> -static struct platform_device *bcm2835_audio;
>   /*
>    * The devices implemented in the VCHIQ firmware are not discoverable,
>    * so we need to maintain a list of them in order to register them with
>    * the interface.
>    */
> +static struct vchiq_device *bcm2835_audio;
>   static struct vchiq_device *bcm2835_camera;
>   
>   struct vchiq_drvdata {
> @@ -1845,7 +1845,7 @@ static int vchiq_probe(struct platform_device *pdev)
>   		goto error_exit;
>   	}
>   
> -	bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
> +	bcm2835_audio = vchiq_device_register(&pdev->dev, "bcm2835-audio");
>   	bcm2835_camera = vchiq_device_register(&pdev->dev, "bcm2835-camera");
>   
>   	return 0;
> @@ -1858,7 +1858,7 @@ static int vchiq_probe(struct platform_device *pdev)
>   
>   static void vchiq_remove(struct platform_device *pdev)
>   {
> -	platform_device_unregister(bcm2835_audio);
> +	vchiq_device_unregister(bcm2835_audio);
>   	vchiq_device_unregister(bcm2835_camera);
>   	vchiq_debugfs_deinit();
>   	vchiq_deregister_chrdev();