projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2018-11-25-master-imports'
[oweals/u-boot.git]
/
cmd
/
sata.c
diff --git
a/cmd/sata.c
b/cmd/sata.c
index 4f0c6e0137162e1990b115436be2e016a667edbd..6d62ba8f74aaceb9702d9db361e68966b89b304a 100644
(file)
--- a/
cmd/sata.c
+++ b/
cmd/sata.c
@@
-51,7
+51,6
@@
int sata_probe(int devnum)
{
#ifdef CONFIG_AHCI
struct udevice *dev;
{
#ifdef CONFIG_AHCI
struct udevice *dev;
- struct udevice *blk;
int rc;
rc = uclass_get_device(UCLASS_AHCI, devnum, &dev);
int rc;
rc = uclass_get_device(UCLASS_AHCI, devnum, &dev);
@@
-67,14
+66,6
@@
int sata_probe(int devnum)
return CMD_RET_FAILURE;
}
return CMD_RET_FAILURE;
}
- rc = blk_get_from_parent(dev, &blk);
- if (!rc) {
- struct blk_desc *desc = dev_get_uclass_platdata(blk);
-
- if (desc->lba > 0 && desc->blksz > 0)
- part_init(desc);
- }
-
return 0;
#else
return sata_initialize() < 0 ? CMD_RET_FAILURE : CMD_RET_SUCCESS;
return 0;
#else
return sata_initialize() < 0 ? CMD_RET_FAILURE : CMD_RET_SUCCESS;