ufs: core: Fold ufs-uclass into ufs

Move the few lines of ufs-uclass.c into ufs.c and remove the
ufs-uclass.c . No functional change.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Link: https://patch.msgid.link/20251028142335.18125-2-marek.vasut+renesas@mailbox.org
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

diff --git a/drivers/ufs/Makefile b/drivers/ufs/Makefile
index 04892d75fe6fc6a222c951e4727e5568b00757c2..9fcb53ee6afd7480b9e4fa045f647d7484b56ea3 100644 (file)
--- 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_UFS_MEDIATEK) += ufs-mediatek.o
 obj-$(CONFIG_QCOM_UFS) += ufs-qcom.o

diff --git a/drivers/ufs/ufs-uclass.c b/drivers/ufs/ufs-uclass.c
deleted file mode 100644 (file)
index 334bfcf..0000000
--- 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 b4f994c5bc0f55122a712bba07b905099b077df2..6d1f9ac1d5f2736d9c6035ec02ac389640cd83c3 100644 (file)
--- a/drivers/ufs/ufs.c
+++ b/drivers/ufs/ufs.c
@@ -2302,3 +2302,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),
+};