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 80518a93bbd415d27e74a35e0e3f556c2afa63e9..690d35c890d2d871e9d92a254f1cf386b0c8077c 100644 (file)
--- 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 50c31b1da68f10b4bac041b961a0b6279e9c2b95..31e8999297196cad628d4de381b76e9f59e438fa 100644 (file)
--- 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),
 };