--- linux-next-20211022.orig/drivers/scsi/ufs/Kconfig
+++ linux-next-20211022/drivers/scsi/ufs/Kconfig
@@ -1,7 +1,6 @@
 #
 # Kernel configuration file for the UFS Host Controller
 #
-# This code is based on drivers/scsi/ufs/Kconfig
 # Copyright (C) 2011-2013 Samsung India Software Operations
 #
 # Authors:
@@ -39,7 +38,7 @@ config SCSI_UFSHCD
 	select DEVFREQ_GOV_SIMPLE_ONDEMAND
 	select NLS
 	help
-	  This selects the support for UFS devices in Linux, say Y and make
+	  This selects the support for UFS devices in Linux. Say Y and make
 	  sure that you know the name of your UFS host adapter (the card
 	  inside your computer that "speaks" the UFS protocol, also
 	  called UFS Host Controller), because you will be asked for it.
@@ -51,7 +50,7 @@ config SCSI_UFSHCD
 	  (the one containing the directory /) is located on a UFS device.
 
 config SCSI_UFSHCD_PCI
-	tristate "PCI bus based UFS Controller support"
+	tristate "PCI bus-based UFS Controller support"
 	depends on SCSI_UFSHCD && PCI
 	help
 	  This selects the PCI UFS Host Controller Interface. Select this if
@@ -70,12 +69,12 @@ config SCSI_UFS_DWC_TC_PCI
 	  If unsure, say N.
 
 config SCSI_UFSHCD_PLATFORM
-	tristate "Platform bus based UFS Controller support"
+	tristate "Platform bus-based UFS Controller support"
 	depends on SCSI_UFSHCD
 	depends on HAS_IOMEM
 	help
 	  This selects the UFS host controller support. Select this if
-	  you have an UFS controller on Platform bus.
+	  you have a UFS controller on Platform bus.
 
 	  If you have a controller with this interface, say Y or M here.
 
@@ -103,23 +102,23 @@ config SCSI_UFS_QCOM
 	select QCOM_SCM if SCSI_UFS_CRYPTO
 	select RESET_CONTROLLER
 	help
-	  This selects the QCOM specific additions to UFSHCD platform driver.
-	  UFS host on QCOM needs some vendor specific configuration before
-	  accessing the hardware which includes PHY configuration and vendor
+	  This selects the QCOM-specific additions to UFSHCD platform driver.
+	  UFS host on QCOM needs some vendor-specific configuration before
+	  accessing the hardware which includes PHY configuration and vendor-
 	  specific registers.
 
 	  Select this if you have UFS controller on QCOM chipset.
 	  If unsure, say N.
 
 config SCSI_UFS_MEDIATEK
-	tristate "Mediatek specific hooks to UFS controller platform driver"
+	tristate "Mediatek-specific hooks to UFS controller platform driver"
 	depends on SCSI_UFSHCD_PLATFORM && ARCH_MEDIATEK
 	select PHY_MTK_UFS
 	select RESET_TI_SYSCON
 	help
-	  This selects the Mediatek specific additions to UFSHCD platform driver.
-	  UFS host on Mediatek needs some vendor specific configuration before
-	  accessing the hardware which includes PHY configuration and vendor
+	  This selects the Mediatek-specific additions to UFSHCD platform driver.
+	  UFS host on Mediatek needs some vendor-specific configuration before
+	  accessing the hardware which includes PHY configuration and vendor-
 	  specific registers.
 
 	  Select this if you have UFS controller on Mediatek chipset.
@@ -127,10 +126,10 @@ config SCSI_UFS_MEDIATEK
 	  If unsure, say N.
 
 config SCSI_UFS_HISI
-	tristate "Hisilicon specific hooks to UFS controller platform driver"
+	tristate "Hisilicon-specific hooks to UFS controller platform driver"
 	depends on (ARCH_HISI || COMPILE_TEST) && SCSI_UFSHCD_PLATFORM
 	help
-	  This selects the Hisilicon specific additions to UFSHCD platform driver.
+	  This selects the Hisilicon-specific additions to UFSHCD platform driver.
 
 	  Select this if you have UFS controller on Hisilicon chipset.
 	  If unsure, say N.
@@ -165,10 +164,10 @@ config SCSI_UFS_BSG
 	  If unsure, say N.
 
 config SCSI_UFS_EXYNOS
-	tristate "Exynos specific hooks to UFS controller platform driver"
+	tristate "Exynos-specific hooks to UFS controller platform driver"
 	depends on SCSI_UFSHCD_PLATFORM && (ARCH_EXYNOS || COMPILE_TEST)
 	help
-	  This selects the Samsung Exynos SoC specific additions to UFSHCD
+	  This selects the Samsung Exynos SoC-specific additions to UFSHCD
 	  platform driver.  UFS host on Samsung Exynos SoC includes HCI and
 	  UNIPRO layer, and associates with UFS-PHY driver.
 
@@ -201,7 +200,7 @@ config SCSI_UFS_FAULT_INJECTION
 	  to test the UFS error handler and abort handler.
 
 config SCSI_UFS_HWMON
-	bool "UFS  Temperature Notification"
+	bool "UFS Temperature Notification"
 	depends on SCSI_UFSHCD=HWMON || HWMON=y
 	help
 	  This provides support for UFS hardware monitoring. If enabled,
