diff options
| author | Simon Glass | 2020-12-03 16:55:18 -0700 |
|---|---|---|
| committer | Simon Glass | 2020-12-13 16:51:08 -0700 |
| commit | caa4daa2ae3dc0a3e516addea5772c9af76abcb0 (patch) | |
| tree | 0abbc5b538894532f4db28d56e4645d3be230d27 /drivers/scsi | |
| parent | 41575d8e4c334df148c4cdd7c40cc825dc0fcaa1 (diff) | |
dm: treewide: Rename 'platdata' variables to just 'plat'
We use 'priv' for private data but often use 'platdata' for platform data.
We can't really use 'pdata' since that is ambiguous (it could mean private
or platform data).
Rename some of the latter variables to end with 'plat' for consistency.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi-uclass.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/scsi.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c index 2b34d0516e6..e9970a7e333 100644 --- a/drivers/scsi/scsi-uclass.c +++ b/drivers/scsi/scsi-uclass.c @@ -35,5 +35,5 @@ int scsi_bus_reset(struct udevice *dev) UCLASS_DRIVER(scsi) = { .id = UCLASS_SCSI, .name = "scsi", - .per_device_platdata_auto = sizeof(struct scsi_platdata), + .per_device_plat_auto = sizeof(struct scsi_platdata), }; diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 0ab1d441f40..6e291e4799e 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -149,9 +149,9 @@ static void scsi_setup_write_ext(struct scsi_cmd *pccb, lbaint_t start, static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, void *buffer) { - struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *block_dev = dev_get_uclass_plat(dev); struct udevice *bdev = dev->parent; - struct scsi_platdata *uc_plat = dev_get_uclass_platdata(bdev); + struct scsi_platdata *uc_plat = dev_get_uclass_plat(bdev); lbaint_t start, blks, max_blks; uintptr_t buf_addr; unsigned short smallblks = 0; @@ -219,9 +219,9 @@ static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, const void *buffer) { - struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *block_dev = dev_get_uclass_plat(dev); struct udevice *bdev = dev->parent; - struct scsi_platdata *uc_plat = dev_get_uclass_platdata(bdev); + struct scsi_platdata *uc_plat = dev_get_uclass_plat(bdev); lbaint_t start, blks, max_blks; uintptr_t buf_addr; unsigned short smallblks; @@ -586,7 +586,7 @@ static int do_scsi_scan_one(struct udevice *dev, int id, int lun, bool verbose) return ret; } - bdesc = dev_get_uclass_platdata(bdev); + bdesc = dev_get_uclass_plat(bdev); bdesc->target = id; bdesc->lun = lun; bdesc->removable = bd.removable; @@ -604,7 +604,7 @@ static int do_scsi_scan_one(struct udevice *dev, int id, int lun, bool verbose) int scsi_scan_dev(struct udevice *dev, bool verbose) { - struct scsi_platdata *uc_plat; /* scsi controller platdata */ + struct scsi_platdata *uc_plat; /* scsi controller plat */ int ret; int i; int lun; @@ -614,8 +614,8 @@ int scsi_scan_dev(struct udevice *dev, bool verbose) if (ret) return ret; - /* Get controller platdata */ - uc_plat = dev_get_uclass_platdata(dev); + /* Get controller plat */ + uc_plat = dev_get_uclass_plat(dev); for (i = 0; i < uc_plat->max_id; i++) for (lun = 0; lun < uc_plat->max_lun; lun++) |