From df365a0d76352c4b675444c660cc4eb53b36d51e Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 20 Mar 2018 16:02:21 +0100 Subject: [PATCH] scsi: Add per-device private data for scsi uclass This patch is doing what was done by "dm: ahci: Correct uclass private data" (sha1: bfc1c6b4838501d10aa48c0e92eaf70976f4b2dd) with reverting pointer to allocated space. It is questionable if sata_ceva should use UCLASS_SCSI or move to UCLASS_SATA but this investigation hasn't been done yet. Signed-off-by: Michal Simek --- drivers/ata/ahci.c | 2 +- drivers/scsi/scsi-uclass.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 690d35c890d..80518a93bbd 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->parent); + uc_priv = dev_get_uclass_priv(dev); #else uc_priv = probe_ent; #endif diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c index 31e89992971..50c31b1da68 100644 --- a/drivers/scsi/scsi-uclass.c +++ b/drivers/scsi/scsi-uclass.c @@ -10,6 +10,7 @@ */ #include +#include #include #include @@ -37,4 +38,5 @@ 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), }; -- 2.47.3