Drivers: hv: Make remove callback of hyperv driver void returned

Dawei Li · liuw · commit 96ec2939620c · 2023-01-17T13:41:27.000Z
Since commit fc7a620 ("bus: Make remove callback return void") forces bus_type::remove be void-returned, it doesn't make much sense for any bus based driver implementing remove callbalk to return non-void to its caller. As such, change the remove function for Hyper-V VMBus based drivers to return void. Signed-off-by: Dawei Li <set_pte_at@outlook.com> Link: https://lore.kernel.org/r/TYCP286MB2323A93C55526E4DF239D3ACCAFA9@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM Signed-off-by: Wei Liu <wei.liu@kernel.org>
diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
@@ -165,7 +165,7 @@ static int hyperv_vmbus_probe(struct hv_device *hdev,
 	return ret;
 }
 
-static int hyperv_vmbus_remove(struct hv_device *hdev)
+static void hyperv_vmbus_remove(struct hv_device *hdev)
 {
 	struct drm_device *dev = hv_get_drvdata(hdev);
 	struct hyperv_drm_device *hv = to_hv(dev);
@@ -176,8 +176,6 @@ static int hyperv_vmbus_remove(struct hv_device *hdev)
 	hv_set_drvdata(hdev, NULL);
 
 	vmbus_free_mmio(hv->mem->start, hv->fb_size);
-
-	return 0;
 }
 
 static int hyperv_vmbus_suspend(struct hv_device *hdev)
diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
@@ -524,7 +524,7 @@ static int mousevsc_probe(struct hv_device *device,
 }
 
 
-static int mousevsc_remove(struct hv_device *dev)
+static void mousevsc_remove(struct hv_device *dev)
 {
 	struct mousevsc_dev *input_dev = hv_get_drvdata(dev);
 
@@ -533,8 +533,6 @@ static int mousevsc_remove(struct hv_device *dev)
 	hid_hw_stop(input_dev->hid_device);
 	hid_destroy_device(input_dev->hid_device);
 	mousevsc_free_device(input_dev);
-
-	return 0;
 }
 
 static int mousevsc_suspend(struct hv_device *dev)
diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
@@ -2042,7 +2042,7 @@ static int balloon_probe(struct hv_device *dev,
 	return ret;
 }
 
-static int balloon_remove(struct hv_device *dev)
+static void balloon_remove(struct hv_device *dev)
 {
 	struct hv_dynmem_device *dm = hv_get_drvdata(dev);
 	struct hv_hotadd_state *has, *tmp;
@@ -2083,8 +2083,6 @@ static int balloon_remove(struct hv_device *dev)
 		kfree(has);
 	}
 	spin_unlock_irqrestore(&dm_device.ha_lock, flags);
-
-	return 0;
 }
 
 static int balloon_suspend(struct hv_device *hv_dev)
diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c
@@ -602,16 +602,14 @@ static int util_probe(struct hv_device *dev,
 	return ret;
 }
 
-static int util_remove(struct hv_device *dev)
+static void util_remove(struct hv_device *dev)
 {
 	struct hv_util_service *srv = hv_get_drvdata(dev);
 
 	if (srv->util_deinit)
 		srv->util_deinit();
 	vmbus_close(dev->channel);
 	kfree(srv->recv_buffer);
-
-	return 0;
 }
 
 /*
diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c
@@ -369,7 +369,7 @@ static int hv_kbd_probe(struct hv_device *hv_dev,
 	return error;
 }
 
-static int hv_kbd_remove(struct hv_device *hv_dev)
+static void hv_kbd_remove(struct hv_device *hv_dev)
 {
 	struct hv_kbd_dev *kbd_dev = hv_get_drvdata(hv_dev);
 
@@ -378,8 +378,6 @@ static int hv_kbd_remove(struct hv_device *hv_dev)
 	kfree(kbd_dev);
 
 	hv_set_drvdata(hv_dev, NULL);
-
-	return 0;
 }
 
 static int hv_kbd_suspend(struct hv_device *hv_dev)
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
@@ -2594,7 +2594,7 @@ static int netvsc_probe(struct hv_device *dev,
 	return ret;
 }
 
-static int netvsc_remove(struct hv_device *dev)
+static void netvsc_remove(struct hv_device *dev)
 {
 	struct net_device_context *ndev_ctx;
 	struct net_device *vf_netdev, *net;
@@ -2603,7 +2603,7 @@ static int netvsc_remove(struct hv_device *dev)
 	net = hv_get_drvdata(dev);
 	if (net == NULL) {
 		dev_err(&dev->device, "No net device to remove\n");
-		return 0;
+		return;
 	}
 
 	ndev_ctx = netdev_priv(net);
@@ -2637,7 +2637,6 @@ static int netvsc_remove(struct hv_device *dev)
 
 	free_percpu(ndev_ctx->vf_stats);
 	free_netdev(net);
-	return 0;
 }
 
 static int netvsc_suspend(struct hv_device *dev)
diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
@@ -3800,13 +3800,10 @@ static int hv_pci_bus_exit(struct hv_device *hdev, bool keep_devs)
 /**
  * hv_pci_remove() - Remove routine for this VMBus channel
  * @hdev:	VMBus's tracking struct for this root PCI bus
- *
- * Return: 0 on success, -errno on failure
  */
-static int hv_pci_remove(struct hv_device *hdev)
+static void hv_pci_remove(struct hv_device *hdev)
 {
 	struct hv_pcibus_device *hbus;
-	int ret;
 
 	hbus = hv_get_drvdata(hdev);
 	if (hbus->state == hv_pcibus_installed) {
@@ -3829,7 +3826,7 @@ static int hv_pci_remove(struct hv_device *hdev)
 		pci_unlock_rescan_remove();
 	}
 
-	ret = hv_pci_bus_exit(hdev, false);
+	hv_pci_bus_exit(hdev, false);
 
 	vmbus_close(hdev->channel);
 
@@ -3842,7 +3839,6 @@ static int hv_pci_remove(struct hv_device *hdev)
 	hv_put_dom_num(hbus->bridge->domain_nr);
 
 	kfree(hbus);
-	return ret;
 }
 
 static int hv_pci_suspend(struct hv_device *hdev)
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
@@ -2092,7 +2092,7 @@ static int storvsc_change_queue_depth(struct scsi_device *sdev, int queue_depth)
 	return scsi_change_queue_depth(sdev, queue_depth);
 }
 
-static int storvsc_remove(struct hv_device *dev)
+static void storvsc_remove(struct hv_device *dev)
 {
 	struct storvsc_device *stor_device = hv_get_drvdata(dev);
 	struct Scsi_Host *host = stor_device->host;
@@ -2108,8 +2108,6 @@ static int storvsc_remove(struct hv_device *dev)
 	scsi_remove_host(host);
 	storvsc_dev_remove(dev);
 	scsi_host_put(host);
-
-	return 0;
 }
 
 static int storvsc_suspend(struct hv_device *hv_dev)
diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c
@@ -355,20 +355,19 @@ hv_uio_probe(struct hv_device *dev,
 	return ret;
 }
 
-static int
+static void
 hv_uio_remove(struct hv_device *dev)
 {
 	struct hv_uio_private_data *pdata = hv_get_drvdata(dev);
 
 	if (!pdata)
-		return 0;
+		return;
 
 	sysfs_remove_bin_file(&dev->channel->kobj, &ring_buffer_bin_attr);
 	uio_unregister_device(&pdata->info);
 	hv_uio_cleanup(dev, pdata);
 
 	vmbus_free_ring(dev->channel);
-	return 0;
 }
 
 static struct hv_driver hv_uio_drv = {
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
@@ -1239,8 +1239,7 @@ static int hvfb_probe(struct hv_device *hdev,
 	return ret;
 }
 
-
-static int hvfb_remove(struct hv_device *hdev)
+static void hvfb_remove(struct hv_device *hdev)
 {
 	struct fb_info *info = hv_get_drvdata(hdev);
 	struct hvfb_par *par = info->par;
@@ -1261,8 +1260,6 @@ static int hvfb_remove(struct hv_device *hdev)
 
 	hvfb_putmem(hdev, info);
 	framebuffer_release(info);
-
-	return 0;
 }
 
 static int hvfb_suspend(struct hv_device *hdev)
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
@@ -1273,7 +1273,7 @@ struct hv_driver {
 	} dynids;
 
 	int (*probe)(struct hv_device *, const struct hv_vmbus_device_id *);
-	int (*remove)(struct hv_device *);
+	void (*remove)(struct hv_device *dev);
 	void (*shutdown)(struct hv_device *);
 
 	int (*suspend)(struct hv_device *);
diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
@@ -879,13 +879,11 @@ static int hvs_probe(struct hv_device *hdev,
 	return 0;
 }
 
-static int hvs_remove(struct hv_device *hdev)
+static void hvs_remove(struct hv_device *hdev)
 {
 	struct vmbus_channel *chan = hdev->channel;
 
 	vmbus_close(chan);
-
-	return 0;
 }
 
 /* hv_sock connections can not persist across hibernation, and all the hv_sock

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ static int hyperv_vmbus_probe(struct hv_device *hdev,`
`165`	`165`	`return ret;`
`166`	`166`	`}`
`167`	`167`
`168`		`-static int hyperv_vmbus_remove(struct hv_device *hdev)`
	`168`	`+static void hyperv_vmbus_remove(struct hv_device *hdev)`
`169`	`169`	`{`
`170`	`170`	`struct drm_device *dev = hv_get_drvdata(hdev);`
`171`	`171`	`struct hyperv_drm_device *hv = to_hv(dev);`
`@@ -176,8 +176,6 @@ static int hyperv_vmbus_remove(struct hv_device *hdev)`
`176`	`176`	`hv_set_drvdata(hdev, NULL);`
`177`	`177`
`178`	`178`	`vmbus_free_mmio(hv->mem->start, hv->fb_size);`
`179`		`-`
`180`		`- return 0;`
`181`	`179`	`}`
`182`	`180`
`183`	`181`	`static int hyperv_vmbus_suspend(struct hv_device *hdev)`
Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ static int mousevsc_probe(struct hv_device *device,`
`524`	`524`	`}`
`525`	`525`
`526`	`526`
`527`		`-static int mousevsc_remove(struct hv_device *dev)`
	`527`	`+static void mousevsc_remove(struct hv_device *dev)`
`528`	`528`	`{`
`529`	`529`	`struct mousevsc_dev *input_dev = hv_get_drvdata(dev);`
`530`	`530`
`@@ -533,8 +533,6 @@ static int mousevsc_remove(struct hv_device *dev)`
`533`	`533`	`hid_hw_stop(input_dev->hid_device);`
`534`	`534`	`hid_destroy_device(input_dev->hid_device);`
`535`	`535`	`mousevsc_free_device(input_dev);`
`536`		`-`
`537`		`- return 0;`
`538`	`536`	`}`
`539`	`537`
`540`	`538`	`static int mousevsc_suspend(struct hv_device *dev)`
Original file line number	Diff line number	Diff line change
`@@ -2042,7 +2042,7 @@ static int balloon_probe(struct hv_device *dev,`
`2042`	`2042`	`return ret;`
`2043`	`2043`	`}`
`2044`	`2044`
`2045`		`-static int balloon_remove(struct hv_device *dev)`
	`2045`	`+static void balloon_remove(struct hv_device *dev)`
`2046`	`2046`	`{`
`2047`	`2047`	`struct hv_dynmem_device *dm = hv_get_drvdata(dev);`
`2048`	`2048`	`struct hv_hotadd_state has, tmp;`
`@@ -2083,8 +2083,6 @@ static int balloon_remove(struct hv_device *dev)`
`2083`	`2083`	`kfree(has);`
`2084`	`2084`	`}`
`2085`	`2085`	`spin_unlock_irqrestore(&dm_device.ha_lock, flags);`
`2086`		`-`
`2087`		`- return 0;`
`2088`	`2086`	`}`
`2089`	`2087`
`2090`	`2088`	`static int balloon_suspend(struct hv_device *hv_dev)`
Original file line number	Diff line number	Diff line change
`@@ -602,16 +602,14 @@ static int util_probe(struct hv_device *dev,`
`602`	`602`	`return ret;`
`603`	`603`	`}`
`604`	`604`
`605`		`-static int util_remove(struct hv_device *dev)`
	`605`	`+static void util_remove(struct hv_device *dev)`
`606`	`606`	`{`
`607`	`607`	`struct hv_util_service *srv = hv_get_drvdata(dev);`
`608`	`608`
`609`	`609`	`if (srv->util_deinit)`
`610`	`610`	`srv->util_deinit();`
`611`	`611`	`vmbus_close(dev->channel);`
`612`	`612`	`kfree(srv->recv_buffer);`
`613`		`-`
`614`		`- return 0;`
`615`	`613`	`}`
`616`	`614`
`617`	`615`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ static int hv_kbd_probe(struct hv_device *hv_dev,`
`369`	`369`	`return error;`
`370`	`370`	`}`
`371`	`371`
`372`		`-static int hv_kbd_remove(struct hv_device *hv_dev)`
	`372`	`+static void hv_kbd_remove(struct hv_device *hv_dev)`
`373`	`373`	`{`
`374`	`374`	`struct hv_kbd_dev *kbd_dev = hv_get_drvdata(hv_dev);`
`375`	`375`
`@@ -378,8 +378,6 @@ static int hv_kbd_remove(struct hv_device *hv_dev)`
`378`	`378`	`kfree(kbd_dev);`
`379`	`379`
`380`	`380`	`hv_set_drvdata(hv_dev, NULL);`
`381`		`-`
`382`		`- return 0;`
`383`	`381`	`}`
`384`	`382`
`385`	`383`	`static int hv_kbd_suspend(struct hv_device *hv_dev)`
Original file line number	Diff line number	Diff line change
`@@ -2594,7 +2594,7 @@ static int netvsc_probe(struct hv_device *dev,`
`2594`	`2594`	`return ret;`
`2595`	`2595`	`}`
`2596`	`2596`
`2597`		`-static int netvsc_remove(struct hv_device *dev)`
	`2597`	`+static void netvsc_remove(struct hv_device *dev)`
`2598`	`2598`	`{`
`2599`	`2599`	`struct net_device_context *ndev_ctx;`
`2600`	`2600`	`struct net_device vf_netdev, net;`
`@@ -2603,7 +2603,7 @@ static int netvsc_remove(struct hv_device *dev)`
`2603`	`2603`	`net = hv_get_drvdata(dev);`
`2604`	`2604`	`if (net == NULL) {`
`2605`	`2605`	`dev_err(&dev->device, "No net device to remove\n");`
`2606`		`- return 0;`
	`2606`	`+ return;`
`2607`	`2607`	`}`
`2608`	`2608`
`2609`	`2609`	`ndev_ctx = netdev_priv(net);`
`@@ -2637,7 +2637,6 @@ static int netvsc_remove(struct hv_device *dev)`
`2637`	`2637`
`2638`	`2638`	`free_percpu(ndev_ctx->vf_stats);`
`2639`	`2639`	`free_netdev(net);`
`2640`		`- return 0;`
`2641`	`2640`	`}`
`2642`	`2641`
`2643`	`2642`	`static int netvsc_suspend(struct hv_device *dev)`
Original file line number	Diff line number	Diff line change
`@@ -2092,7 +2092,7 @@ static int storvsc_change_queue_depth(struct scsi_device *sdev, int queue_depth)`
`2092`	`2092`	`return scsi_change_queue_depth(sdev, queue_depth);`
`2093`	`2093`	`}`
`2094`	`2094`
`2095`		`-static int storvsc_remove(struct hv_device *dev)`
	`2095`	`+static void storvsc_remove(struct hv_device *dev)`
`2096`	`2096`	`{`
`2097`	`2097`	`struct storvsc_device *stor_device = hv_get_drvdata(dev);`
`2098`	`2098`	`struct Scsi_Host *host = stor_device->host;`
`@@ -2108,8 +2108,6 @@ static int storvsc_remove(struct hv_device *dev)`
`2108`	`2108`	`scsi_remove_host(host);`
`2109`	`2109`	`storvsc_dev_remove(dev);`
`2110`	`2110`	`scsi_host_put(host);`
`2111`		`-`
`2112`		`- return 0;`
`2113`	`2111`	`}`
`2114`	`2112`
`2115`	`2113`	`static int storvsc_suspend(struct hv_device *hv_dev)`
Original file line number	Diff line number	Diff line change
`@@ -355,20 +355,19 @@ hv_uio_probe(struct hv_device *dev,`
`355`	`355`	`return ret;`
`356`	`356`	`}`
`357`	`357`
`358`		`-static int`
	`358`	`+static void`
`359`	`359`	`hv_uio_remove(struct hv_device *dev)`
`360`	`360`	`{`
`361`	`361`	`struct hv_uio_private_data *pdata = hv_get_drvdata(dev);`
`362`	`362`
`363`	`363`	`if (!pdata)`
`364`		`- return 0;`
	`364`	`+ return;`
`365`	`365`
`366`	`366`	`sysfs_remove_bin_file(&dev->channel->kobj, &ring_buffer_bin_attr);`
`367`	`367`	`uio_unregister_device(&pdata->info);`
`368`	`368`	`hv_uio_cleanup(dev, pdata);`
`369`	`369`
`370`	`370`	`vmbus_free_ring(dev->channel);`
`371`		`- return 0;`
`372`	`371`	`}`
`373`	`372`
`374`	`373`	`static struct hv_driver hv_uio_drv = {`
Original file line number	Diff line number	Diff line change
`@@ -1239,8 +1239,7 @@ static int hvfb_probe(struct hv_device *hdev,`
`1239`	`1239`	`return ret;`
`1240`	`1240`	`}`
`1241`	`1241`
`1242`		`-`
`1243`		`-static int hvfb_remove(struct hv_device *hdev)`
	`1242`	`+static void hvfb_remove(struct hv_device *hdev)`
`1244`	`1243`	`{`
`1245`	`1244`	`struct fb_info *info = hv_get_drvdata(hdev);`
`1246`	`1245`	`struct hvfb_par *par = info->par;`
`@@ -1261,8 +1260,6 @@ static int hvfb_remove(struct hv_device *hdev)`
`1261`	`1260`
`1262`	`1261`	`hvfb_putmem(hdev, info);`
`1263`	`1262`	`framebuffer_release(info);`
`1264`		`-`
`1265`		`- return 0;`
`1266`	`1263`	`}`
`1267`	`1264`
`1268`	`1265`	`static int hvfb_suspend(struct hv_device *hdev)`