scsi: ufs: Split the drivers/scsi/ufs directory
Subsystems (8)
Bart Van Assche
reviewerPATCH v2 29/29 scsi: ufs: Split the drivers/scsi/ufs directory
Split the drivers/scsi/ufs directory into a ufs-core and a ufs-drivers directory. Move shared header files into the include/scsi directory. This separation makes it clear which header files UFS drivers are allowed to include (include/scsi/*.h) and which header files UFS drivers are not allowed to include (drivers/scsi/ufs-core/*.h).
Update the MAINTAINERS file. Add myself as a UFS reviewer.
Signed-off-by Bart Van Assche <[email protected]>
---
MAINTAINERS | 9 ++-
drivers/Kconfig | 2 +
drivers/Makefile | 1 +
drivers/scsi/Kconfig | 1 -
drivers/scsi/Makefile | 1 -
drivers/ufs/Kconfig | 30 ++++++++
drivers/ufs/Makefile | 5 ++
drivers/ufs/core/Kconfig | 60 +++++++++++++++
drivers/ufs/core/Makefile | 10 +++
drivers/{scsi/ufs => ufs/core}/ufs-debugfs.c | 2 +-
drivers/{scsi/ufs => ufs/core}/ufs-debugfs.h | 0
.../ufs => ufs/core}/ufs-fault-injection.c | 0
.../ufs => ufs/core}/ufs-fault-injection.h | 0
drivers/{scsi/ufs => ufs/core}/ufs-hwmon.c | 2 +-
drivers/{scsi/ufs => ufs/core}/ufs-sysfs.c | 2 +-
drivers/{scsi/ufs => ufs/core}/ufs-sysfs.h | 0
drivers/{scsi/ufs => ufs/core}/ufs_bsg.c | 2 +-
drivers/{scsi/ufs => ufs/core}/ufs_bsg.h | 0
.../{scsi/ufs => ufs/core}/ufshcd-crypto.c | 2 +-
.../{scsi/ufs => ufs/core}/ufshcd-crypto.h | 4 +-
drivers/{scsi/ufs => ufs/core}/ufshcd-priv.h | 2 +-
drivers/{scsi/ufs => ufs/core}/ufshcd.c | 4 +-
drivers/{scsi/ufs => ufs/core}/ufshpb.c | 2 +-
drivers/{scsi/ufs => ufs/core}/ufshpb.h | 0
drivers/{scsi/ufs => ufs/host}/Kconfig | 75 +------------------
drivers/{scsi/ufs => ufs/host}/Makefile | 12 ---
drivers/{scsi/ufs => ufs/host}/cdns-pltfrm.c | 0
.../{scsi/ufs => ufs/host}/tc-dwc-g210-pci.c | 2 +-
.../ufs => ufs/host}/tc-dwc-g210-pltfrm.c | 0
drivers/{scsi/ufs => ufs/host}/tc-dwc-g210.c | 4 +-
drivers/{scsi/ufs => ufs/host}/tc-dwc-g210.h | 0
drivers/{scsi/ufs => ufs/host}/ti-j721e-ufs.c | 0
drivers/{scsi/ufs => ufs/host}/ufs-exynos.c | 6 +-
drivers/{scsi/ufs => ufs/host}/ufs-exynos.h | 0
drivers/{scsi/ufs => ufs/host}/ufs-hisi.c | 8 +-
drivers/{scsi/ufs => ufs/host}/ufs-hisi.h | 0
.../ufs => ufs/host}/ufs-mediatek-trace.h | 2 +-
drivers/{scsi/ufs => ufs/host}/ufs-mediatek.c | 6 +-
drivers/{scsi/ufs => ufs/host}/ufs-mediatek.h | 0
drivers/{scsi/ufs => ufs/host}/ufs-qcom-ice.c | 0
drivers/{scsi/ufs => ufs/host}/ufs-qcom.c | 8 +-
drivers/{scsi/ufs => ufs/host}/ufs-qcom.h | 2 +-
drivers/{scsi/ufs => ufs/host}/ufshcd-dwc.c | 4 +-
drivers/{scsi/ufs => ufs/host}/ufshcd-dwc.h | 2 +-
drivers/{scsi/ufs => ufs/host}/ufshcd-pci.c | 2 +-
.../{scsi/ufs => ufs/host}/ufshcd-pltfrm.c | 4 +-
.../{scsi/ufs => ufs/host}/ufshcd-pltfrm.h | 2 +-
drivers/{scsi/ufs => ufs/host}/ufshci-dwc.h | 0
{drivers/scsi/ufs => include/scsi}/ufs.h | 0
.../scsi/ufs => include/scsi}/ufs_quirks.h | 0
{drivers/scsi/ufs => include/scsi}/ufshcd.h | 8 +-
{drivers/scsi/ufs => include/scsi}/ufshci.h | 0
{drivers/scsi/ufs => include/scsi}/unipro.h | 0
53 files changed, 155 insertions(+), 133 deletions(-)
create mode 100644 drivers/ufs/Kconfig
create mode 100644 drivers/ufs/Makefile
create mode 100644 drivers/ufs/core/Kconfig
create mode 100644 drivers/ufs/core/Makefile
rename drivers/{scsi/ufs => ufs/core}/ufs-debugfs.c (99%)
rename drivers/{scsi/ufs => ufs/core}/ufs-debugfs.h (100%)
rename drivers/{scsi/ufs => ufs/core}/ufs-fault-injection.c (100%)
rename drivers/{scsi/ufs => ufs/core}/ufs-fault-injection.h (100%)
rename drivers/{scsi/ufs => ufs/core}/ufs-hwmon.c (99%)
rename drivers/{scsi/ufs => ufs/core}/ufs-sysfs.c (99%)
rename drivers/{scsi/ufs => ufs/core}/ufs-sysfs.h (100%)
rename drivers/{scsi/ufs => ufs/core}/ufs_bsg.c (99%)
rename drivers/{scsi/ufs => ufs/core}/ufs_bsg.h (100%)
rename drivers/{scsi/ufs => ufs/core}/ufshcd-crypto.c (99%)
rename drivers/{scsi/ufs => ufs/core}/ufshcd-crypto.h (97%)
rename drivers/{scsi/ufs => ufs/core}/ufshcd-priv.h (99%)
rename drivers/{scsi/ufs => ufs/core}/ufshcd.c (99%)
rename drivers/{scsi/ufs => ufs/core}/ufshpb.c (99%)
rename drivers/{scsi/ufs => ufs/core}/ufshpb.h (100%)
rename drivers/{scsi/ufs => ufs/host}/Kconfig (56%)
rename drivers/{scsi/ufs => ufs/host}/Makefile (56%)
rename drivers/{scsi/ufs => ufs/host}/cdns-pltfrm.c (100%)
rename drivers/{scsi/ufs => ufs/host}/tc-dwc-g210-pci.c (99%)
rename drivers/{scsi/ufs => ufs/host}/tc-dwc-g210-pltfrm.c (100%)
rename drivers/{scsi/ufs => ufs/host}/tc-dwc-g210.c (99%)
rename drivers/{scsi/ufs => ufs/host}/tc-dwc-g210.h (100%)
rename drivers/{scsi/ufs => ufs/host}/ti-j721e-ufs.c (100%)
rename drivers/{scsi/ufs => ufs/host}/ufs-exynos.c (99%)
rename drivers/{scsi/ufs => ufs/host}/ufs-exynos.h (100%)
rename drivers/{scsi/ufs => ufs/host}/ufs-hisi.c (99%)
rename drivers/{scsi/ufs => ufs/host}/ufs-hisi.h (100%)
rename drivers/{scsi/ufs => ufs/host}/ufs-mediatek-trace.h (93%)
rename drivers/{scsi/ufs => ufs/host}/ufs-mediatek.c (99%)
rename drivers/{scsi/ufs => ufs/host}/ufs-mediatek.h (100%)
rename drivers/{scsi/ufs => ufs/host}/ufs-qcom-ice.c (100%)
rename drivers/{scsi/ufs => ufs/host}/ufs-qcom.c (99%)
rename drivers/{scsi/ufs => ufs/host}/ufs-qcom.h (99%)
rename drivers/{scsi/ufs => ufs/host}/ufshcd-dwc.c (98%)
rename drivers/{scsi/ufs => ufs/host}/ufshcd-dwc.h (95%)
rename drivers/{scsi/ufs => ufs/host}/ufshcd-pci.c (99%)
rename drivers/{scsi/ufs => ufs/host}/ufshcd-pltfrm.c (99%)
rename drivers/{scsi/ufs => ufs/host}/ufshcd-pltfrm.h (98%)
rename drivers/{scsi/ufs => ufs/host}/ufshci-dwc.h (100%)
rename {drivers/scsi/ufs => include/scsi}/ufs.h (100%)
rename {drivers/scsi/ufs => include/scsi}/ufs_quirks.h (100%)
rename {drivers/scsi/ufs => include/scsi}/ufshcd.h (99%)
rename {drivers/scsi/ufs => include/scsi}/ufshci.h (100%)
rename {drivers/scsi/ufs => include/scsi}/unipro.h (100%)MAINTAINERS +5 -4
@@ -2547,7 +2547,7 @@ F: drivers/pci/controller/dwc/pcie-qcom.c F: drivers/phy/qualcomm/ F: drivers/power/*/msm* F: drivers/reset/reset-qcom-* -F: drivers/scsi/ufs/ufs-qcom* +F: drivers/ufs/host/ufs-qcom* F: drivers/spi/spi-geni-qcom.c F: drivers/spi/spi-qcom-qspi.c F: drivers/spi/spi-qup.c
@@ -20198,24 +20198,25 @@ F: include/linux/visorbus.h UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER R: Alim Akhtar <[email protected]> R: Avri Altman <[email protected]> +R: Bart Van Assche <[email protected]> L: [email protected] S: Supported F: Documentation/devicetree/bindings/ufs/ F: Documentation/scsi/ufs.rst -F: drivers/scsi/ufs/ +F: drivers/ufs/core/ UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS M: Pedro Sousa <[email protected]> L: [email protected] S: Supported -F: drivers/scsi/ufs/*dwc* +F: drivers/ufs/host/*dwc* UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS M: Stanley Chu <[email protected]> L: [email protected] L: [email protected] (moderated for non-subscribers) S: Maintained -F: drivers/scsi/ufs/ufs-mediatek* +F: drivers/ufs/host/ufs-mediatek* UNSORTED BLOCK IMAGES (UBI) M: Richard Weinberger <[email protected]>
drivers/Kconfig +2 -0
@@ -107,6 +107,8 @@ source "drivers/usb/Kconfig" source "drivers/mmc/Kconfig" +source "drivers/ufs/Kconfig" + source "drivers/memstick/Kconfig" source "drivers/leds/Kconfig"
drivers/Makefile +1 -0
@@ -128,6 +128,7 @@ obj-$(CONFIG_PM_OPP) += opp/ obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_CPU_IDLE) += cpuidle/ obj-y += mmc/ +obj-y += ufs/ obj-$(CONFIG_MEMSTICK) += memstick/ obj-$(CONFIG_NEW_LEDS) += leds/ obj-$(CONFIG_INFINIBAND) += infiniband/
drivers/scsi/Kconfig +0 -1
@@ -500,7 +500,6 @@ source "drivers/scsi/megaraid/Kconfig.megaraid" source "drivers/scsi/mpt3sas/Kconfig" source "drivers/scsi/mpi3mr/Kconfig" source "drivers/scsi/smartpqi/Kconfig" -source "drivers/scsi/ufs/Kconfig" config SCSI_HPTIOP tristate "HighPoint RocketRAID 3xxx/4xxx Controller support"
drivers/scsi/Makefile +0 -1
@@ -101,7 +101,6 @@ obj-$(CONFIG_MEGARAID_NEWGEN) += megaraid/ obj-$(CONFIG_MEGARAID_SAS) += megaraid/ obj-$(CONFIG_SCSI_MPT3SAS) += mpt3sas/ obj-$(CONFIG_SCSI_MPI3MR) += mpi3mr/ -obj-$(CONFIG_SCSI_UFSHCD) += ufs/ obj-$(CONFIG_SCSI_ACARD) += atp870u.o obj-$(CONFIG_SCSI_SUNESP) += esp_scsi.o sun_esp.o obj-$(CONFIG_SCSI_INITIO) += initio.o
drivers/ufs/Kconfig new file +30 -0
@@ -0,0 +1,30 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# UFS subsystem configuration +# + +menuconfig SCSI_UFSHCD + tristate "Universal Flash Storage Controller" + depends on SCSI && SCSI_DMA + select PM_DEVFREQ + select DEVFREQ_GOV_SIMPLE_ONDEMAND + select NLS + help + Enables support for UFS (Universal Flash Storage) host controllers. + A UFS host controller is an electronic component that is able to + communicate with a UFS card. UFS host controllers occur in + smartphones, laptops, digital cameras and also in cars. + The kernel module will be called ufshcd. + + To compile this driver as a module, choose M here and read + <file:Documentation/scsi/ufs.rst>. + However, do not compile this as a module if your root file system + (the one containing the directory /) is located on a UFS device. + +if SCSI_UFSHCD + +source "drivers/ufs/core/Kconfig" + +source "drivers/ufs/host/Kconfig" + +endif
drivers/ufs/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + +# The link order is important here. ufshcd-core must initialize +# before vendor drivers. +obj-$(CONFIG_SCSI_UFSHCD) += core/ host/
drivers/ufs/core/Kconfig new file +60 -0
60 lines not on this page · raw message
drivers/ufs/core/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_SCSI_UFSHCD) += ufshcd-core.o +ufshcd-core-y += ufshcd.o ufs-sysfs.o +ufshcd-core-$(CONFIG_DEBUG_FS) += ufs-debugfs.o +ufshcd-core-$(CONFIG_SCSI_UFS_BSG) += ufs_bsg.o +ufshcd-core-$(CONFIG_SCSI_UFS_CRYPTO) += ufshcd-crypto.o +ufshcd-core-$(CONFIG_SCSI_UFS_HPB) += ufshpb.o +ufshcd-core-$(CONFIG_SCSI_UFS_FAULT_INJECTION) += ufs-fault-injection.o +ufshcd-core-$(CONFIG_SCSI_UFS_HWMON) += ufs-hwmon.o
drivers/ufs/core/ufs-debugfs.c renamed from drivers/scsi/ufs/ufs-debugfs.c +1 -1
@@ -4,7 +4,7 @@#include <linux/debugfs.h> #include "ufs-debugfs.h" -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include "ufshcd-priv.h" static struct dentry *ufs_debugfs_root;
drivers/ufs/core/ufs-debugfs.h renamed from drivers/scsi/ufs/ufs-debugfs.h +0 -0
drivers/ufs/core/ufs-fault-injection.c renamed from drivers/scsi/ufs/ufs-fault-injection.c +0 -0
drivers/ufs/core/ufs-fault-injection.h renamed from drivers/scsi/ufs/ufs-fault-injection.h +0 -0
drivers/ufs/core/ufs-hwmon.c renamed from drivers/scsi/ufs/ufs-hwmon.c +1 -1
@@ -7,7 +7,7 @@#include <linux/hwmon.h> #include <linux/units.h> -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include "ufshcd-priv.h" struct ufs_hwmon_data {
drivers/ufs/core/ufs-sysfs.c renamed from drivers/scsi/ufs/ufs-sysfs.c +1 -1
@@ -6,7 +6,7 @@#include <linux/bitfield.h> #include <asm/unaligned.h> -#include "ufs.h" +#include <scsi/ufs.h> #include "ufs-sysfs.h" #include "ufshcd-priv.h"
drivers/ufs/core/ufs-sysfs.h renamed from drivers/scsi/ufs/ufs-sysfs.h +0 -0
drivers/ufs/core/ufs_bsg.c renamed from drivers/scsi/ufs/ufs_bsg.c +1 -1
@@ -9,7 +9,7 @@#include <scsi/scsi.h> #include <scsi/scsi_host.h> #include "ufs_bsg.h" -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include "ufshcd-priv.h" static int ufs_bsg_get_query_desc_size(struct ufs_hba *hba, int *desc_len,
drivers/ufs/core/ufs_bsg.h renamed from drivers/scsi/ufs/ufs_bsg.h +0 -0
drivers/ufs/core/ufshcd-crypto.c renamed from drivers/scsi/ufs/ufshcd-crypto.c +1 -1
@@ -3,7 +3,7 @@* Copyright 2019 Google LLC */ -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include "ufshcd-crypto.h" /* Blk-crypto modes supported by UFS crypto */
drivers/ufs/core/ufshcd-crypto.h renamed from drivers/scsi/ufs/ufshcd-crypto.h +2 -2
@@ -7,9 +7,9 @@#define _UFSHCD_CRYPTO_H#include <scsi/scsi_cmnd.h> -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include "ufshcd-priv.h" -#include "ufshci.h" +#include <scsi/ufshci.h> #ifdef CONFIG_SCSI_UFS_CRYPTO
drivers/ufs/core/ufshcd-priv.h renamed from drivers/scsi/ufs/ufshcd-priv.h +1 -1
@@ -4,7 +4,7 @@#define _UFSHCD_PRIV_H_#include <linux/pm_runtime.h> -#include "ufshcd.h" +#include <scsi/ufshcd.h> static inline bool ufshcd_is_user_access_allowed (struct ufs_hba *hba) {
drivers/ufs/core/ufshcd.c renamed from drivers/scsi/ufs/ufshcd.c +2 -2
@@ -27,8 +27,8 @@#include <scsi/scsi_driver.h> #include <scsi/scsi_eh.h> #include "ufshcd-priv.h" -#include "ufs_quirks.h" -#include "unipro.h" +#include <scsi/ufs_quirks.h> +#include <scsi/unipro.h> #include "ufs-sysfs.h" #include "ufs-debugfs.h" #include "ufs-fault-injection.h"
drivers/ufs/core/ufshpb.c renamed from drivers/scsi/ufs/ufshpb.c +1 -1
@@ -17,7 +17,7 @@#include "ufshcd-priv.h" #include "ufshpb.h" -#include "../sd.h" +#include "../../scsi/sd.h" #define ACTIVATION_THRESHOLD 8/* 8 IOs */ #define READ_TO_MS 1000
drivers/ufs/core/ufshpb.h renamed from drivers/scsi/ufs/ufshpb.h +0 -0
drivers/ufs/host/Kconfig renamed from drivers/scsi/ufs/Kconfig +1 -74
95 lines not on this page · raw message
drivers/ufs/host/Makefile renamed from drivers/scsi/ufs/Makefile +0 -12
@@ -1,16 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -# UFSHCD makefile - -# The link order is important here. ufshcd-core must initialize -# before vendor drivers. -obj-$(CONFIG_SCSI_UFSHCD) += ufshcd-core.o -ufshcd-core-y += ufshcd.o ufs-sysfs.o -ufshcd-core-$(CONFIG_DEBUG_FS) += ufs-debugfs.o -ufshcd-core-$(CONFIG_SCSI_UFS_BSG) += ufs_bsg.o -ufshcd-core-$(CONFIG_SCSI_UFS_CRYPTO) += ufshcd-crypto.o -ufshcd-core-$(CONFIG_SCSI_UFS_HPB) += ufshpb.o -ufshcd-core-$(CONFIG_SCSI_UFS_FAULT_INJECTION) += ufs-fault-injection.o -ufshcd-core-$(CONFIG_SCSI_UFS_HWMON) += ufs-hwmon.o obj-$(CONFIG_SCSI_UFS_DWC_TC_PCI) += tc-dwc-g210-pci.o ufshcd-dwc.o tc-dwc-g210.o obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-dwc-g210.o
drivers/ufs/host/cdns-pltfrm.c renamed from drivers/scsi/ufs/cdns-pltfrm.c +0 -0
drivers/ufs/host/tc-dwc-g210-pci.c renamed from drivers/scsi/ufs/tc-dwc-g210-pci.c +1 -1
@@ -7,7 +7,7 @@* Authors: Joao Pinto <[email protected]> */ -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include "ufshcd-dwc.h" #include "tc-dwc-g210.h"
drivers/ufs/host/tc-dwc-g210-pltfrm.c renamed from drivers/scsi/ufs/tc-dwc-g210-pltfrm.c +0 -0
drivers/ufs/host/tc-dwc-g210.c renamed from drivers/scsi/ufs/tc-dwc-g210.c +2 -2
@@ -9,8 +9,8 @@#include <linux/module.h> -#include "ufshcd.h" -#include "unipro.h" +#include <scsi/ufshcd.h> +#include <scsi/unipro.h> #include "ufshcd-dwc.h" #include "ufshci-dwc.h"
drivers/ufs/host/tc-dwc-g210.h renamed from drivers/scsi/ufs/tc-dwc-g210.h +0 -0
drivers/ufs/host/ti-j721e-ufs.c renamed from drivers/scsi/ufs/ti-j721e-ufs.c +0 -0
drivers/ufs/host/ufs-exynos.c renamed from drivers/scsi/ufs/ufs-exynos.c +3 -3
@@ -18,10 +18,10 @@#include <linux/platform_device.h> #include <linux/regmap.h> -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include "ufshcd-pltfrm.h" -#include "ufshci.h" -#include "unipro.h" +#include <scsi/ufshci.h> +#include <scsi/unipro.h> #include "ufs-exynos.h"
drivers/ufs/host/ufs-exynos.h renamed from drivers/scsi/ufs/ufs-exynos.h +0 -0
drivers/ufs/host/ufs-hisi.c renamed from drivers/scsi/ufs/ufs-hisi.c +4 -4
@@ -15,12 +15,12 @@#include <linux/platform_device.h> #include <linux/reset.h> -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include "ufshcd-pltfrm.h" -#include "unipro.h" +#include <scsi/unipro.h> #include "ufs-hisi.h" -#include "ufshci.h" -#include "ufs_quirks.h" +#include <scsi/ufshci.h> +#include <scsi/ufs_quirks.h> static int ufs_hisi_check_hibern8 (struct ufs_hba *hba) {
drivers/ufs/host/ufs-hisi.h renamed from drivers/scsi/ufs/ufs-hisi.h +0 -0
drivers/ufs/host/ufs-mediatek-trace.h renamed from drivers/scsi/ufs/ufs-mediatek-trace.h +1 -1
@@ -31,6 +31,6 @@ TRACE_EVENT(ufs_mtk_event,#undef TRACE_INCLUDE_PATH#undef TRACE_INCLUDE_FILE -#define TRACE_INCLUDE_PATH ../../drivers/scsi/ufs/ +#define TRACE_INCLUDE_PATH ../../drivers/ufs/host#define TRACE_INCLUDE_FILE ufs-mediatek-trace#include <trace/define_trace.h>
drivers/ufs/host/ufs-mediatek.c renamed from drivers/scsi/ufs/ufs-mediatek.c +3 -3
@@ -21,10 +21,10 @@#include <linux/sched/clock.h> #include <linux/soc/mediatek/mtk_sip_svc.h> -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include "ufshcd-pltfrm.h" -#include "ufs_quirks.h" -#include "unipro.h" +#include <scsi/ufs_quirks.h> +#include <scsi/unipro.h> #include "ufs-mediatek.h" #define CREATE_TRACE_POINTS
drivers/ufs/host/ufs-mediatek.h renamed from drivers/scsi/ufs/ufs-mediatek.h +0 -0
drivers/ufs/host/ufs-qcom-ice.c renamed from drivers/scsi/ufs/ufs-qcom-ice.c +0 -0
drivers/ufs/host/ufs-qcom.c renamed from drivers/scsi/ufs/ufs-qcom.c +4 -4
@@ -15,12 +15,12 @@#include <linux/reset-controller.h> #include <linux/devfreq.h> -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include "ufshcd-pltfrm.h" -#include "unipro.h" +#include <scsi/unipro.h> #include "ufs-qcom.h" -#include "ufshci.h" -#include "ufs_quirks.h" +#include <scsi/ufshci.h> +#include <scsi/ufs_quirks.h> #define UFS_QCOM_DEFAULT_DBG_PRINT_EN \ (UFS_QCOM_DBG_PRINT_REGS_EN | UFS_QCOM_DBG_PRINT_TEST_BUS_EN)
drivers/ufs/host/ufs-qcom.h renamed from drivers/scsi/ufs/ufs-qcom.h +1 -1
@@ -7,7 +7,7 @@#include <linux/reset-controller.h> #include <linux/reset.h> -#include "ufshcd.h" +#include <scsi/ufshcd.h> #define MAX_UFS_QCOM_HOSTS 1#define MAX_U32 (~(u32)0)
drivers/ufs/host/ufshcd-dwc.c renamed from drivers/scsi/ufs/ufshcd-dwc.c +2 -2
@@ -9,8 +9,8 @@#include <linux/module.h> -#include "ufshcd.h" -#include "unipro.h" +#include <scsi/ufshcd.h> +#include <scsi/unipro.h> #include "ufshcd-dwc.h" #include "ufshci-dwc.h"
drivers/ufs/host/ufshcd-dwc.h renamed from drivers/scsi/ufs/ufshcd-dwc.h +1 -1
@@ -10,7 +10,7 @@ #ifndef _UFSHCD_DWC_H #define _UFSHCD_DWC_H -#include "ufshcd.h" +#include <scsi/ufshcd.h> struct ufshcd_dme_attr_val { u32 attr_sel;
drivers/ufs/host/ufshcd-pci.c renamed from drivers/scsi/ufs/ufshcd-pci.c +1 -1
@@ -9,7 +9,7 @@* Vinayak Holikatti <[email protected]> */ -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include <linux/delay.h> #include <linux/module.h> #include <linux/pci.h>
drivers/ufs/host/ufshcd-pltfrm.c renamed from drivers/scsi/ufs/ufshcd-pltfrm.c +2 -2
@@ -13,9 +13,9 @@#include <linux/pm_runtime.h> #include <linux/of.h> -#include "ufshcd.h" +#include <scsi/ufshcd.h> #include "ufshcd-pltfrm.h" -#include "unipro.h" +#include <scsi/unipro.h> #define UFSHCD_DEFAULT_LANES_PER_DIRECTION 2
drivers/ufs/host/ufshcd-pltfrm.h renamed from drivers/scsi/ufs/ufshcd-pltfrm.h +1 -1
@@ -5,7 +5,7 @@#ifndef UFSHCD_PLTFRM_H_ #define UFSHCD_PLTFRM_H_ -#include "ufshcd.h" +#include <scsi/ufshcd.h> #define UFS_PWM_MODE 1#define UFS_HS_MODE 2
drivers/ufs/host/ufshci-dwc.h renamed from drivers/scsi/ufs/ufshci-dwc.h +0 -0
include/scsi/ufs.h renamed from drivers/scsi/ufs/ufs.h +0 -0
include/scsi/ufs_quirks.h renamed from drivers/scsi/ufs/ufs_quirks.h +0 -0
include/scsi/ufshcd.h renamed from drivers/scsi/ufs/ufshcd.h +4 -4
@@ -18,10 +18,10 @@#include <linux/devfreq.h> #include <linux/pm_runtime.h> #include <scsi/scsi_device.h> -#include "unipro.h" -#include "ufs.h" -#include "ufs_quirks.h" -#include "ufshci.h" +#include <scsi/unipro.h> +#include <scsi/ufs.h> +#include <scsi/ufs_quirks.h> +#include <scsi/ufshci.h> #define UFSHCD "ufshcd"