From: Michal Simek <michal.simek@xilinx.com>
Date: Fri, 6 Apr 2018 11:55:30 +0000 (+0200)
Subject: Revert "scsi: Add per-device private data for scsi uclass"
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb592aff0f1c196cc40ecd089e341e30f0735c0a;p=thirdparty%2Fu-boot.git

Revert "scsi: Add per-device private data for scsi uclass"

This reverts commit df365a0d76352c4b675444c660cc4eb53b36d51e.

The reason is that next patch is converting ceva driver to UCLASS_AHCI
which is also fixing issue introduced by reported patch.

In mainline there is another fix for that.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 80518a93bbd..690d35c890d 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 50c31b1da68..31e89992971 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),
 };