staging: vchiq_arm: Remove extra struct vchiq_instance declaration

Message ID 20221221074047.233473-1-umang.jain@ideasonboard.com
State New
Headers
Series staging: vchiq_arm: Remove extra struct vchiq_instance declaration |

Commit Message

Umang Jain Dec. 21, 2022, 7:40 a.m. UTC
  Additional declaration of struct vchiq_instance was introduced in the
commit 726e79f8a648 ("staging: vchiq_arm: pass vchiq instance to
service callbacks"). Drop the extra declaration.

Fixes: 726e79f8a648 ("staging: vchiq_arm: pass vchiq instance to service callbacks")
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
---
 drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h | 2 --
 1 file changed, 2 deletions(-)
  

Comments

Stefan Wahren Dec. 21, 2022, 11:34 a.m. UTC | #1
Am 21.12.22 um 08:40 schrieb Umang Jain:
> Additional declaration of struct vchiq_instance was introduced in the
> commit 726e79f8a648 ("staging: vchiq_arm: pass vchiq instance to
> service callbacks"). Drop the extra declaration.
>
> Fixes: 726e79f8a648 ("staging: vchiq_arm: pass vchiq instance to service callbacks")
> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Stefan Wahren <stefan.wahren@i2se.com>
  
Kieran Bingham Dec. 21, 2022, 12:33 p.m. UTC | #2
Quoting Umang Jain (2022-12-21 07:40:47)
> Additional declaration of struct vchiq_instance was introduced in the
> commit 726e79f8a648 ("staging: vchiq_arm: pass vchiq instance to
> service callbacks"). Drop the extra declaration.
> 
> Fixes: 726e79f8a648 ("staging: vchiq_arm: pass vchiq instance to service callbacks")
> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>

It's tempting to move the other instance up to near the top of the file
too, but not necessary.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
> index 66965da11443..52e106f117da 100644
> --- a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
> +++ b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
> @@ -78,8 +78,6 @@ struct vchiq_service_params_kernel {
>         short version_min;   /* Update for incompatible changes */
>  };
>  
> -struct vchiq_instance;
> -
>  extern int vchiq_initialise(struct vchiq_instance **pinstance);
>  extern int vchiq_shutdown(struct vchiq_instance *instance);
>  extern int vchiq_connect(struct vchiq_instance *instance);
> -- 
> 2.38.1
>
  
Umang Jain June 20, 2023, 1:46 p.m. UTC | #3
Hi again,

Can this be collected please?. The series has two R-b tags and I think 
it got skipped during the last window?

On 12/21/22 1:10 PM, Umang Jain wrote:
> Additional declaration of struct vchiq_instance was introduced in the
> commit 726e79f8a648 ("staging: vchiq_arm: pass vchiq instance to
> service callbacks"). Drop the extra declaration.
>
> Fixes: 726e79f8a648 ("staging: vchiq_arm: pass vchiq instance to service callbacks")
> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
> ---
>   drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h | 2 --
>   1 file changed, 2 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
> index 66965da11443..52e106f117da 100644
> --- a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
> +++ b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
> @@ -78,8 +78,6 @@ struct vchiq_service_params_kernel {
>   	short version_min;   /* Update for incompatible changes */
>   };
>   
> -struct vchiq_instance;
> -
>   extern int vchiq_initialise(struct vchiq_instance **pinstance);
>   extern int vchiq_shutdown(struct vchiq_instance *instance);
>   extern int vchiq_connect(struct vchiq_instance *instance);
  
Greg KH June 20, 2023, 2:11 p.m. UTC | #4
On Tue, Jun 20, 2023 at 07:16:15PM +0530, Umang Jain wrote:
> Hi again,
> 
> Can this be collected please?. The series has two R-b tags and I think it
> got skipped during the last window?

SOrry for the delay, this got dropped somewhere, now queued up.

greg k-h
  

Patch

diff --git a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
index 66965da11443..52e106f117da 100644
--- a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
+++ b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
@@ -78,8 +78,6 @@  struct vchiq_service_params_kernel {
 	short version_min;   /* Update for incompatible changes */
 };
 
-struct vchiq_instance;
-
 extern int vchiq_initialise(struct vchiq_instance **pinstance);
 extern int vchiq_shutdown(struct vchiq_instance *instance);
 extern int vchiq_connect(struct vchiq_instance *instance);