diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 80518a93bb..690d35c890 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -935,7 +935,7 @@ static int ahci_scsi_exec(struct udevice *dev, struct scsi_cmd *pccb)
 {
 	struct ahci_uc_priv *uc_priv;
 #ifdef CONFIG_DM_SCSI
-	uc_priv = dev_get_uclass_priv(dev);
+	uc_priv = dev_get_uclass_priv(dev->parent);
 #else
 	uc_priv = probe_ent;
 #endif
diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c
index 50c31b1da6..31e8999297 100644
--- a/drivers/scsi/scsi-uclass.c
+++ b/drivers/scsi/scsi-uclass.c
@@ -10,7 +10,6 @@
  */
 
 #include <common.h>
-#include <ahci.h>
 #include <dm.h>
 #include <scsi.h>
 
@@ -38,5 +37,4 @@ UCLASS_DRIVER(scsi) = {
 	.id		= UCLASS_SCSI,
 	.name		= "scsi",
 	.per_device_platdata_auto_alloc_size = sizeof(struct scsi_platdata),
-	.per_device_auto_alloc_size = sizeof(struct ahci_uc_priv),
 };