mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
nvme: Fix warning of cast from pointer to integer of different size
When dma_addr_t is u32 in 64-bit, there are some warnings when building NVME driver. Fix it by doing an additional (long) cast. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
parent
b52e9f0cb7
commit
5b2a20e956
|
@ -577,7 +577,7 @@ static int nvme_get_info_from_identify(struct nvme_dev *dev)
|
||||||
int ret;
|
int ret;
|
||||||
int shift = NVME_CAP_MPSMIN(dev->cap) + 12;
|
int shift = NVME_CAP_MPSMIN(dev->cap) + 12;
|
||||||
|
|
||||||
ret = nvme_identify(dev, 0, 1, (dma_addr_t)ctrl);
|
ret = nvme_identify(dev, 0, 1, (dma_addr_t)(long)ctrl);
|
||||||
if (ret)
|
if (ret)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
|
@ -646,7 +646,7 @@ static int nvme_blk_probe(struct udevice *udev)
|
||||||
ns->dev = ndev;
|
ns->dev = ndev;
|
||||||
/* extract the namespace id from the block device name */
|
/* extract the namespace id from the block device name */
|
||||||
ns->ns_id = trailing_strtol(udev->name) + 1;
|
ns->ns_id = trailing_strtol(udev->name) + 1;
|
||||||
if (nvme_identify(ndev, ns->ns_id, 0, (dma_addr_t)id))
|
if (nvme_identify(ndev, ns->ns_id, 0, (dma_addr_t)(long)id))
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
flbas = id->flbas & NVME_NS_FLBAS_LBA_MASK;
|
flbas = id->flbas & NVME_NS_FLBAS_LBA_MASK;
|
||||||
|
|
|
@ -111,14 +111,14 @@ int nvme_print_info(struct udevice *udev)
|
||||||
ALLOC_CACHE_ALIGN_BUFFER(char, buf_ctrl, sizeof(struct nvme_id_ctrl));
|
ALLOC_CACHE_ALIGN_BUFFER(char, buf_ctrl, sizeof(struct nvme_id_ctrl));
|
||||||
struct nvme_id_ctrl *ctrl = (struct nvme_id_ctrl *)buf_ctrl;
|
struct nvme_id_ctrl *ctrl = (struct nvme_id_ctrl *)buf_ctrl;
|
||||||
|
|
||||||
if (nvme_identify(dev, 0, 1, (dma_addr_t)ctrl))
|
if (nvme_identify(dev, 0, 1, (dma_addr_t)(long)ctrl))
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
print_optional_admin_cmd(le16_to_cpu(ctrl->oacs), ns->devnum);
|
print_optional_admin_cmd(le16_to_cpu(ctrl->oacs), ns->devnum);
|
||||||
print_optional_nvm_cmd(le16_to_cpu(ctrl->oncs), ns->devnum);
|
print_optional_nvm_cmd(le16_to_cpu(ctrl->oncs), ns->devnum);
|
||||||
print_format_nvme_attributes(ctrl->fna, ns->devnum);
|
print_format_nvme_attributes(ctrl->fna, ns->devnum);
|
||||||
|
|
||||||
if (nvme_identify(dev, ns->ns_id, 0, (dma_addr_t)id))
|
if (nvme_identify(dev, ns->ns_id, 0, (dma_addr_t)(long)id))
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
print_formats(id, ns);
|
print_formats(id, ns);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user