mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 07:04:28 +00:00
blk: Use a macro for the typical block size
Avoid using the magic number 512 directly. Signed-off-by: Bin Meng <bmeng@tinylab.org> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
833ff23047
commit
7020b2eca4
10 changed files with 16 additions and 10 deletions
|
@ -219,8 +219,8 @@ static int usb_stor_probe_device(struct usb_device *udev)
|
|||
|
||||
snprintf(str, sizeof(str), "lun%d", lun);
|
||||
ret = blk_create_devicef(udev->dev, "usb_storage_blk", str,
|
||||
UCLASS_USB, usb_max_devs, 512, 0,
|
||||
&dev);
|
||||
UCLASS_USB, usb_max_devs,
|
||||
DEFAULT_BLKSZ, 0, &dev);
|
||||
if (ret) {
|
||||
debug("Cannot bind driver\n");
|
||||
return ret;
|
||||
|
|
|
@ -880,7 +880,8 @@ int dwc_ahsata_scan(struct udevice *dev)
|
|||
device_find_first_child(dev, &blk);
|
||||
if (!blk) {
|
||||
ret = blk_create_devicef(dev, "dwc_ahsata_blk", "blk",
|
||||
UCLASS_AHCI, -1, 512, 0, &blk);
|
||||
UCLASS_AHCI, -1, DEFAULT_BLKSZ,
|
||||
0, &blk);
|
||||
if (ret) {
|
||||
debug("Can't create device\n");
|
||||
return ret;
|
||||
|
|
|
@ -888,7 +888,8 @@ static int fsl_ata_probe(struct udevice *dev)
|
|||
for (i = 0; i < nr_ports; i++) {
|
||||
snprintf(sata_name, sizeof(sata_name), "fsl_sata%d", i);
|
||||
ret = blk_create_devicef(dev, "sata_fsl_blk", sata_name,
|
||||
UCLASS_AHCI, -1, 512, 0, &blk);
|
||||
UCLASS_AHCI, -1, DEFAULT_BLKSZ,
|
||||
0, &blk);
|
||||
if (ret) {
|
||||
debug("Can't create device\n");
|
||||
return ret;
|
||||
|
|
|
@ -1076,7 +1076,8 @@ static int sata_mv_probe(struct udevice *dev)
|
|||
|
||||
for (i = 0; i < nr_ports; i++) {
|
||||
ret = blk_create_devicef(dev, "sata_mv_blk", "blk",
|
||||
UCLASS_AHCI, -1, 512, 0, &blk);
|
||||
UCLASS_AHCI, -1, DEFAULT_BLKSZ,
|
||||
0, &blk);
|
||||
if (ret) {
|
||||
debug("Can't create device\n");
|
||||
continue;
|
||||
|
|
|
@ -730,7 +730,8 @@ static int sil_pci_probe(struct udevice *dev)
|
|||
for (i = sata_info.portbase; i < sata_info.maxport; i++) {
|
||||
snprintf(sata_name, sizeof(sata_name), "sil_sata%d", i);
|
||||
ret = blk_create_devicef(dev, "sata_sil_blk", sata_name,
|
||||
UCLASS_AHCI, -1, 512, 0, &blk);
|
||||
UCLASS_AHCI, -1, DEFAULT_BLKSZ,
|
||||
0, &blk);
|
||||
if (ret) {
|
||||
debug("Can't create device\n");
|
||||
return ret;
|
||||
|
|
|
@ -390,7 +390,7 @@ int blkmap_dev_bind(struct udevice *dev)
|
|||
int err;
|
||||
|
||||
err = blk_create_devicef(dev, "blkmap_blk", "blk", UCLASS_BLKMAP,
|
||||
dev_seq(dev), 512, 0, &bm->blk);
|
||||
dev_seq(dev), DEFAULT_BLKSZ, 0, &bm->blk);
|
||||
if (err)
|
||||
return log_msg_ret("blk", err);
|
||||
|
||||
|
|
|
@ -105,7 +105,7 @@ static int host_sb_bind(struct udevice *dev)
|
|||
int ret;
|
||||
|
||||
ret = blk_create_devicef(dev, "sandbox_host_blk", "blk", UCLASS_HOST,
|
||||
dev_seq(dev), 512, 0, &blk);
|
||||
dev_seq(dev), DEFAULT_BLKSZ, 0, &blk);
|
||||
if (ret)
|
||||
return log_msg_ret("blk", ret);
|
||||
|
||||
|
|
|
@ -412,7 +412,7 @@ int mmc_bind(struct udevice *dev, struct mmc *mmc, const struct mmc_config *cfg)
|
|||
debug("%s: alias devnum=%d\n", __func__, dev_seq(dev));
|
||||
|
||||
ret = blk_create_devicef(dev, "mmc_blk", "blk", UCLASS_MMC,
|
||||
dev_seq(dev), 512, 0, &bdev);
|
||||
dev_seq(dev), DEFAULT_BLKSZ, 0, &bdev);
|
||||
if (ret) {
|
||||
debug("Cannot create block device\n");
|
||||
return ret;
|
||||
|
|
|
@ -906,7 +906,7 @@ int nvme_init(struct udevice *udev)
|
|||
|
||||
/* The real blksz and size will be set by nvme_blk_probe() */
|
||||
ret = blk_create_devicef(udev, "nvme-blk", name, UCLASS_NVME,
|
||||
-1, 512, 0, &ns_udev);
|
||||
-1, DEFAULT_BLKSZ, 0, &ns_udev);
|
||||
if (ret)
|
||||
goto free_id;
|
||||
|
||||
|
|
|
@ -21,6 +21,8 @@ typedef ulong lbaint_t;
|
|||
#define LBAF "%" LBAFlength "x"
|
||||
#define LBAFU "%" LBAFlength "u"
|
||||
|
||||
#define DEFAULT_BLKSZ 512
|
||||
|
||||
struct udevice;
|
||||
|
||||
static inline bool blk_enabled(void)
|
||||
|
|
Loading…
Reference in a new issue