virtio: split device_register into device_initialize and device_add
PATCH v5 1/4 virtio: split device_register into device_initialize and device_add
In order to make caller do a simple cleanup, we split device_register into device_initialize and device_add. device_initialize always succeeds, so the caller can always use put_device when register_virtio_device faild.
Signed-off-by weiping zhang <[email protected]>
Suggested-by Cornelia Huck <[email protected]>
--- drivers/virtio/virtio.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/virtio/virtio.c +15 -3
@@ -303,11 +303,21 @@ void unregister_virtio_driver(struct virtio_driver *driver) }EXPORT_SYMBOL_GPL (unregister_virtio_driver); +/** +* register_virtio_device - register virtio device +* @dev : virtio device to be registered +* +* On error, the caller must call put_device on &@dev->dev (and not kfree), +* as another code path may have obtained a reference to @dev. +* +* Returns: 0 on suceess, -error on failure +*/ int register_virtio_device (struct virtio_device *dev) {int err; dev->dev.bus = &virtio_bus; +device_initialize (&dev->dev);/* Assign a unique device index and hence name. */ err =ida_simple_get (&virtio_index_ida,0 ,0 ,GFP_KERNEL );
@@ -330,9 +340,11 @@ int register_virtio_device(struct virtio_device *dev)INIT_LIST_HEAD (&dev->vqs); -/* device_register() causes the bus infrastructure to look for a -* matching driver. */ - err =device_register (&dev->dev); +/* +* device_add() causes the bus infrastructure to look for a matching +* driver. +*/ + err =device_add (&dev->dev);if (err)ida_simple_remove (&virtio_index_ida, dev->index); out:
Signature · 1 line
2.9.4
Quoted 9 lines · On Thu, 21 Dec 2017 20:39:50 +0800 weiping zhang…
In order to make caller do a simple cleanup, we split
device_registerintodevice_initializeanddevice_add.device_initializealways succeeds, so the caller can always useput_devicewhenregister_virtio_devicefaild.Signed-off-by weiping zhang <[email protected]>Suggested-by Cornelia Huck <[email protected]>--- drivers/virtio/virtio.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
Reviewed-by Cornelia Huck <[email protected]>