From: Marek Vasut <marek.vasut+renesas@mailbox.org>
Date: Tue, 28 Oct 2025 14:22:22 +0000 (+0100)
Subject: ufs: core: Fold ufs-uclass into ufs
X-Git-Tag: v2026.01-rc2~56^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea97b856179338a51cb6fd3fef07680e5e2c662a;p=thirdparty%2Fu-boot.git

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 04892d75fe6..9fcb53ee6af 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_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
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 b4f994c5bc0..6d1f9ac1d5f 100644
--- 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),
+};