Move the few lines of ufs-uclass.c into ufs.c and remove the ufs-uclass.c . No functional change.
Reviewed-by: Neil Armstrong <[email protected]> Signed-off-by: Marek Vasut <[email protected]> --- Cc: Bhupesh Sharma <[email protected]> Cc: Casey Connolly <[email protected]> Cc: Michal Simek <[email protected]> Cc: Neha Malcom Francis <[email protected]> Cc: Neil Armstrong <[email protected]> Cc: Nobuhiro Iwamatsu <[email protected]> Cc: Sumit Garg <[email protected]> Cc: Tom Rini <[email protected]> Cc: Tuyen Dang <[email protected]> Cc: Venkatesh Yadav Abbarapu <[email protected]> Cc: Yoshihiro Shimoda <[email protected]> Cc: [email protected] Cc: [email protected] --- V2: Add RB from Neil --- drivers/ufs/Makefile | 2 +- drivers/ufs/ufs-uclass.c | 17 ----------------- drivers/ufs/ufs.c | 6 ++++++ 3 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 drivers/ufs/ufs-uclass.c diff --git a/drivers/ufs/Makefile b/drivers/ufs/Makefile index 548306fb99e..2ac410cf7c3 100644 --- a/drivers/ufs/Makefile +++ b/drivers/ufs/Makefile @@ -3,7 +3,7 @@ # Copyright (C) 2019 Texas Instruments Incorporated - https://www.ti.com # -obj-$(CONFIG_UFS) += ufs.o ufs-uclass.o +obj-$(CONFIG_UFS) += ufs.o obj-$(CONFIG_CADENCE_UFS) += cdns-platform.o obj-$(CONFIG_QCOM_UFS) += ufs-qcom.o obj-$(CONFIG_TI_J721E_UFS) += ti-j721e-ufs.o diff --git a/drivers/ufs/ufs-uclass.c b/drivers/ufs/ufs-uclass.c deleted file mode 100644 index 334bfcfa06a..00000000000 --- a/drivers/ufs/ufs-uclass.c +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/** - * ufs-uclass.c - Universal Flash Storage (UFS) Uclass driver - * - * Copyright (C) 2019 Texas Instruments Incorporated - https://www.ti.com - */ - -#define LOG_CATEGORY UCLASS_UFS - -#include "ufs.h" -#include <dm.h> - -UCLASS_DRIVER(ufs) = { - .id = UCLASS_UFS, - .name = "ufs", - .per_device_auto = sizeof(struct ufs_hba), -}; diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c index 57e6e8c013b..c1f3301b37e 100644 --- a/drivers/ufs/ufs.c +++ b/drivers/ufs/ufs.c @@ -2091,3 +2091,9 @@ U_BOOT_DRIVER(ufs_scsi) = { .name = "ufs_scsi", .ops = &ufs_ops, }; + +UCLASS_DRIVER(ufs) = { + .id = UCLASS_UFS, + .name = "ufs", + .per_device_auto = sizeof(struct ufs_hba), +}; -- 2.51.0
