RE: [PATCH 26/29] scsi: ufs: Split the ufshcd.h header file

["Chanho Park" <chanho61.park@samsung.com>]

> > I'm seeing below build error when I applied this patch. Any baseline
> > do I need?
> >
> > In file included from drivers/scsi/ufs/ufs-sysfs.c:9:
> > drivers/scsi/ufs/ufshcd-priv.h:32:20: error: redefinition of
> > 'ufs_hwmon_probe'
> >     32 | static inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask)
> {}
> >        |                    ^~~~~~~~~~~~~~~
> > In file included from drivers/scsi/ufs/ufshcd-priv.h:5,
> >                   from drivers/scsi/ufs/ufs-sysfs.c:9:
> > drivers/scsi/ufs/ufshcd.h:1079:20: note: previous definition of
> > 'ufs_hwmon_probe' with type 'void(struct ufs_hba *, u8)' {aka
> > 'void(struct ufs_hba *, unsigned char)'}
> >   1079 | static inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask)
> {}
> >        |                    ^~~~~~~~~~~~~~~
> > In file included from drivers/scsi/ufs/ufs-sysfs.c:9:
> > drivers/scsi/ufs/ufshcd-priv.h:33:20: error: redefinition of
> > 'ufs_hwmon_remove'
> >     33 | static inline void ufs_hwmon_remove(struct ufs_hba *hba) {}
> >        |                    ^~~~~~~~~~~~~~~~
> > In file included from drivers/scsi/ufs/ufshcd-priv.h:5,
> >                   from drivers/scsi/ufs/ufs-sysfs.c:9:
> > drivers/scsi/ufs/ufshcd.h:1080:20: note: previous definition of
> > 'ufs_hwmon_remove' with type 'void(struct ufs_hba *)'
> >   1080 | static inline void ufs_hwmon_remove(struct ufs_hba *hba) {}
> >        |                    ^~~~~~~~~~~~~~~~
> 
> Hi Chanho,
> 
> Patch 26/29 duplicates the ufs_hwmon_remove() etc. definitions instead of
> moving these. The patch below needs to be applied on top of this patch to
> make it build. I will fix this when I repost this patch series.

Below can fix the build errors. Thanks for the update.

Best Regards,
Chanho Park

> 
> Thanks,
> 
> Bart.
> 
> diff --git a/include/scsi/ufshcd.h b/include/scsi/ufshcd.h index
> 946d915f5a42..3caec295d87a 100644
> --- a/include/scsi/ufshcd.h
> +++ b/include/scsi/ufshcd.h
> @@ -1071,16 +1071,6 @@ static inline void *ufshcd_get_variant(struct
> ufs_hba *hba)
>   	return hba->priv;
>   }
> 
> -#ifdef CONFIG_SCSI_UFS_HWMON
> -void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask); -void
> ufs_hwmon_remove(struct ufs_hba *hba); -void ufs_hwmon_notify_event(struct
> ufs_hba *hba, u8 ee_mask); -#else -static inline void
> ufs_hwmon_probe(struct ufs_hba *hba, u8 mask) {} -static inline void
> ufs_hwmon_remove(struct ufs_hba *hba) {} -static inline void
> ufs_hwmon_notify_event(struct ufs_hba *hba, u8
> ee_mask) {}
> -#endif
> -
>   #ifdef CONFIG_PM
>   extern int ufshcd_runtime_suspend(struct device *dev);
>   extern int ufshcd_runtime_resume(struct device *dev);