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

From: Bart Van Assche <bvanassche@acm.org>
To: Chanho Park <chanho61.park@samsung.com>,
	"'Martin K . Petersen'" <martin.petersen@oracle.com>
Cc: 'Jaegeuk Kim' <jaegeuk@kernel.org>,
	'Adrian Hunter' <adrian.hunter@intel.com>,
	linux-scsi@vger.kernel.org,
	"'James E.J. Bottomley'" <jejb@linux.ibm.com>,
	'Avri Altman' <Avri.Altman@wdc.com>,
	'Can Guo' <cang@codeaurora.org>,
	'Asutosh Das' <asutoshd@codeaurora.org>,
	'Daejun Park' <daejun7.park@samsung.com>,
	'Guenter Roeck' <linux@roeck-us.net>,
	'Bean Huo' <beanhuo@micron.com>,
	'Keoseong Park' <keosung.park@samsung.com>,
	'Mike Snitzer' <snitzer@redhat.com>,
	'Eric Biggers' <ebiggers@google.com>,
	'Jens Axboe' <axboe@kernel.dk>,
	'Ulf Hansson' <ulf.hansson@linaro.org>
Subject: Re: [PATCH 26/29] scsi: ufs: Split the ufshcd.h header file
Date: Thu, 31 Mar 2022 21:14:31 -0700	[thread overview]
Message-ID: <91fb8b36-b3dd-c68b-5d08-49928c1e6d27@acm.org> (raw)
In-Reply-To: <002201d8455e$67b46e70$371d4b50$@samsung.com>

On 3/31/22 17:21, Chanho Park wrote:
> 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.

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);
