diff options
Diffstat (limited to 'drivers/block/virtio_blk.c')
| -rw-r--r-- | drivers/block/virtio_blk.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 87ab505f83..cbef500d59 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com> @@ -99,19 +99,15 @@ static int virtio_blk_probe(struct virtio_device *vdev) devnum = cdev_find_free_index("virtioblk"); priv->blk.cdev.name = xasprintf("virtioblk%d", devnum); + cdev_set_of_node(&priv->blk.cdev, vdev->dev.device_node); priv->blk.dev = &vdev->dev; priv->blk.blockbits = SECTOR_SHIFT; virtio_cread(vdev, struct virtio_blk_config, capacity, &cap); priv->blk.num_blocks = cap; priv->blk.ops = &virtio_blk_ops; + priv->blk.type = BLK_TYPE_VIRTUAL; - ret = blockdevice_register(&priv->blk); - if (ret) - return ret; - - parse_partition_table(&priv->blk); - - return 0; + return blockdevice_register(&priv->blk); } static void virtio_blk_remove(struct virtio_device *vdev) |