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

This reverts commit df365a0d76.

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>
This commit is contained in:
Michal Simek
2018-04-06 13:55:30 +02:00
parent 328b87fd3d
commit fb592aff0f
2 changed files with 1 additions and 3 deletions

View File

@@ -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

View File

@@ -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),
};