Skip to content

Commit 65e93ec

Browse files
jhovoldgregkh
authored andcommitted
virtio-mmio: fix device release warning on module unload
commit c687bc3 upstream. Driver core expects devices to be allocated dynamically and complains loudly when a device that lacks a release function is freed. Use __root_device_register() to allocate and register the root device instead of open coding using a static device. Note that root_device_register(), which also creates a link to the module, cannot be used as the device is registered when parsing the module parameters which happens before the module kobject has been set up. Fixes: 81a054c ("virtio-mmio: Devices parameter parsing") Cc: stable@vger.kernel.org # 3.5 Cc: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Message-ID: <20260427143710.14702-1-johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 075bc3c commit 65e93ec

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

drivers/virtio/virtio_mmio.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -662,17 +662,14 @@ static void virtio_mmio_remove(struct platform_device *pdev)
662662

663663
#if defined(CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES)
664664

665-
static struct device vm_cmdline_parent = {
666-
.init_name = "virtio-mmio-cmdline",
667-
};
665+
static struct device *vm_cmdline_parent;
668666

669667
static int vm_cmdline_parent_registered;
670668
static int vm_cmdline_id;
671669

672670
static int vm_cmdline_set(const char *device,
673671
const struct kernel_param *kp)
674672
{
675-
int err;
676673
struct resource resources[2] = {};
677674
char *str;
678675
long long base, size;
@@ -704,11 +701,10 @@ static int vm_cmdline_set(const char *device,
704701
resources[1].start = resources[1].end = irq;
705702

706703
if (!vm_cmdline_parent_registered) {
707-
err = device_register(&vm_cmdline_parent);
708-
if (err) {
709-
put_device(&vm_cmdline_parent);
704+
vm_cmdline_parent = __root_device_register("virtio-mmio-cmdline", NULL);
705+
if (IS_ERR(vm_cmdline_parent)) {
710706
pr_err("Failed to register parent device!\n");
711-
return err;
707+
return PTR_ERR(vm_cmdline_parent);
712708
}
713709
vm_cmdline_parent_registered = 1;
714710
}
@@ -719,7 +715,7 @@ static int vm_cmdline_set(const char *device,
719715
(unsigned long long)resources[0].end,
720716
(int)resources[1].start);
721717

722-
pdev = platform_device_register_resndata(&vm_cmdline_parent,
718+
pdev = platform_device_register_resndata(vm_cmdline_parent,
723719
"virtio-mmio", vm_cmdline_id++,
724720
resources, ARRAY_SIZE(resources), NULL, 0);
725721

@@ -743,8 +739,12 @@ static int vm_cmdline_get_device(struct device *dev, void *data)
743739
static int vm_cmdline_get(char *buffer, const struct kernel_param *kp)
744740
{
745741
buffer[0] = '\0';
746-
device_for_each_child(&vm_cmdline_parent, buffer,
747-
vm_cmdline_get_device);
742+
743+
if (vm_cmdline_parent_registered) {
744+
device_for_each_child(vm_cmdline_parent, buffer,
745+
vm_cmdline_get_device);
746+
}
747+
748748
return strlen(buffer) + 1;
749749
}
750750

@@ -766,9 +766,9 @@ static int vm_unregister_cmdline_device(struct device *dev,
766766
static void vm_unregister_cmdline_devices(void)
767767
{
768768
if (vm_cmdline_parent_registered) {
769-
device_for_each_child(&vm_cmdline_parent, NULL,
769+
device_for_each_child(vm_cmdline_parent, NULL,
770770
vm_unregister_cmdline_device);
771-
device_unregister(&vm_cmdline_parent);
771+
root_device_unregister(vm_cmdline_parent);
772772
vm_cmdline_parent_registered = 0;
773773
}
774774
}

0 commit comments

Comments
 (0)