mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-22 02:17:36 -04:00
vdpa_sim_net: switch to dynamic root device
Driver core expects devices to be dynamically allocated and will, for example, complain loudly when no release function has been provided. Use root_device_register() to allocate and register the root device instead of open coding using a static device. Signed-off-by: Johan Hovold <johan@kernel.org> Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Message-ID: <20260424104703.2619093-3-johan@kernel.org>
This commit is contained in:
committed by
Michael S. Tsirkin
parent
4f3da991b5
commit
e13fc46b4d
@@ -453,14 +453,7 @@ static void vdpasim_net_free(struct vdpasim *vdpasim)
|
||||
kvfree(net->buffer);
|
||||
}
|
||||
|
||||
static void vdpasim_net_mgmtdev_release(struct device *dev)
|
||||
{
|
||||
}
|
||||
|
||||
static struct device vdpasim_net_mgmtdev = {
|
||||
.init_name = "vdpasim_net",
|
||||
.release = vdpasim_net_mgmtdev_release,
|
||||
};
|
||||
static struct device *vdpasim_net_mgmtdev;
|
||||
|
||||
static int vdpasim_net_dev_add(struct vdpa_mgmt_dev *mdev, const char *name,
|
||||
const struct vdpa_dev_set_config *config)
|
||||
@@ -538,7 +531,6 @@ static struct virtio_device_id id_table[] = {
|
||||
};
|
||||
|
||||
static struct vdpa_mgmt_dev mgmt_dev = {
|
||||
.device = &vdpasim_net_mgmtdev,
|
||||
.id_table = id_table,
|
||||
.ops = &vdpasim_net_mgmtdev_ops,
|
||||
.config_attr_mask = (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR |
|
||||
@@ -552,26 +544,25 @@ static int __init vdpasim_net_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = device_register(&vdpasim_net_mgmtdev);
|
||||
if (ret) {
|
||||
put_device(&vdpasim_net_mgmtdev);
|
||||
return ret;
|
||||
}
|
||||
vdpasim_net_mgmtdev = root_device_register("vdpasim_net");
|
||||
if (IS_ERR(vdpasim_net_mgmtdev))
|
||||
return PTR_ERR(vdpasim_net_mgmtdev);
|
||||
|
||||
mgmt_dev.device = vdpasim_net_mgmtdev;
|
||||
ret = vdpa_mgmtdev_register(&mgmt_dev);
|
||||
if (ret)
|
||||
goto parent_err;
|
||||
return 0;
|
||||
|
||||
parent_err:
|
||||
device_unregister(&vdpasim_net_mgmtdev);
|
||||
root_device_unregister(vdpasim_net_mgmtdev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void __exit vdpasim_net_exit(void)
|
||||
{
|
||||
vdpa_mgmtdev_unregister(&mgmt_dev);
|
||||
device_unregister(&vdpasim_net_mgmtdev);
|
||||
root_device_unregister(vdpasim_net_mgmtdev);
|
||||
}
|
||||
|
||||
module_init(vdpasim_net_init);
|
||||
|
||||
Reference in New Issue
Block a user