2021-03-30 10:58:59

by Jiabing Wan

Subject: [PATCH] arch: s390: Remove duplicate struct ccw1 declaration

struct ccw1 is declared twice. One has been declared
at 21st line. Remove the duplicate.

Signed-off-by: Wan Jiabing <[email protected]>
---
arch/s390/include/asm/ccwdev.h | 3 ---
1 file changed, 3 deletions(-)

diff --git a/arch/s390/include/asm/ccwdev.h b/arch/s390/include/asm/ccwdev.h
index 778247bb1d61..d4e90f2ba77e 100644
--- a/arch/s390/include/asm/ccwdev.h
+++ b/arch/s390/include/asm/ccwdev.h
@@ -152,9 +152,6 @@ extern struct ccw_device *get_ccwdev_by_busid(struct ccw_driver *cdrv,
* when new devices for its type pop up */
extern int ccw_driver_register (struct ccw_driver *driver);
extern void ccw_driver_unregister (struct ccw_driver *driver);
-
-struct ccw1;
-
extern int ccw_device_set_options_mask(struct ccw_device *, unsigned long);
extern int ccw_device_set_options(struct ccw_device *, unsigned long);
extern void ccw_device_clear_options(struct ccw_device *, unsigned long);
--
2.25.1

2021-03-30 18:42:02

by Vineeth Vijayan

Subject: Re: [PATCH] arch: s390: Remove duplicate struct ccw1 declaration

Thank you for the patch.
Acked-by: Vineeth Vijayan <[email protected]>
Heiko/Vasily will pick this up and will be part of the s390-tree patchset.

On 3/30/21 12:56 PM, Wan Jiabing wrote:
> struct ccw1 is declared twice. One has been declared
> at 21st line. Remove the duplicate.
>
> Signed-off-by: Wan Jiabing <[email protected]>
> ---
> arch/s390/include/asm/ccwdev.h | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/arch/s390/include/asm/ccwdev.h b/arch/s390/include/asm/ccwdev.h
> index 778247bb1d61..d4e90f2ba77e 100644
> --- a/arch/s390/include/asm/ccwdev.h
> +++ b/arch/s390/include/asm/ccwdev.h
> @@ -152,9 +152,6 @@ extern struct ccw_device *get_ccwdev_by_busid(struct ccw_driver *cdrv,
> * when new devices for its type pop up */
> extern int ccw_driver_register (struct ccw_driver *driver);
> extern void ccw_driver_unregister (struct ccw_driver *driver);
> -
> -struct ccw1;
> -
> extern int ccw_device_set_options_mask(struct ccw_device *, unsigned long);
> extern int ccw_device_set_options(struct ccw_device *, unsigned long);
> extern void ccw_device_clear_options(struct ccw_device *, unsigned long);