Merge tag 'for-linus-6.2-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

torvalds · torvalds · commit bad8c4a850ea · 2023-01-12T17:02:20.000-06:00
Pull xen fixes from Juergen Gross:

 - two cleanup patches

 - a fix of a memory leak in the Xen pvfront driver

 - a fix of a locking issue in the Xen hypervisor console driver

* tag 'for-linus-6.2-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/pvcalls: free active map buffer on pvcalls_front_free_map
  hvc/xen: lock console list traversal
  x86/xen: Remove the unused function p2m_index()
  xen: make remove callback of xen driver void returned
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
@@ -134,11 +134,6 @@ static inline unsigned p2m_mid_index(unsigned long pfn)
 	return (pfn / P2M_PER_PAGE) % P2M_MID_PER_PAGE;
 }
 
-static inline unsigned p2m_index(unsigned long pfn)
-{
-	return pfn % P2M_PER_PAGE;
-}
-
 static void p2m_top_mfn_init(unsigned long *top)
 {
 	unsigned i;
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
@@ -524,7 +524,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,
 	return 0;
 }
 
-static int xen_blkbk_remove(struct xenbus_device *dev)
+static void xen_blkbk_remove(struct xenbus_device *dev)
 {
 	struct backend_info *be = dev_get_drvdata(&dev->dev);
 
@@ -547,8 +547,6 @@ static int xen_blkbk_remove(struct xenbus_device *dev)
 		/* Put the reference we set in xen_blkif_alloc(). */
 		xen_blkif_put(be->blkif);
 	}
-
-	return 0;
 }
 
 int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt,
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
@@ -2467,7 +2467,7 @@ static void blkback_changed(struct xenbus_device *dev,
 	}
 }
 
-static int blkfront_remove(struct xenbus_device *xbdev)
+static void blkfront_remove(struct xenbus_device *xbdev)
 {
 	struct blkfront_info *info = dev_get_drvdata(&xbdev->dev);
 
@@ -2488,7 +2488,6 @@ static int blkfront_remove(struct xenbus_device *xbdev)
 	}
 
 	kfree(info);
-	return 0;
 }
 
 static int blkfront_is_ready(struct xenbus_device *dev)
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
@@ -360,14 +360,13 @@ static int tpmfront_probe(struct xenbus_device *dev,
 	return tpm_chip_register(priv->chip);
 }
 
-static int tpmfront_remove(struct xenbus_device *dev)
+static void tpmfront_remove(struct xenbus_device *dev)
 {
 	struct tpm_chip *chip = dev_get_drvdata(&dev->dev);
 	struct tpm_private *priv = dev_get_drvdata(&chip->dev);
 	tpm_chip_unregister(chip);
 	ring_free(priv);
 	dev_set_drvdata(&chip->dev, NULL);
-	return 0;
 }
 
 static int tpmfront_resume(struct xenbus_device *dev)
diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c
@@ -717,7 +717,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev,
 	return xenbus_switch_state(xb_dev, XenbusStateInitialising);
 }
 
-static int xen_drv_remove(struct xenbus_device *dev)
+static void xen_drv_remove(struct xenbus_device *dev)
 {
 	struct xen_drm_front_info *front_info = dev_get_drvdata(&dev->dev);
 	int to = 100;
@@ -751,7 +751,6 @@ static int xen_drv_remove(struct xenbus_device *dev)
 
 	xen_drm_drv_fini(front_info);
 	xenbus_frontend_closed(dev);
-	return 0;
 }
 
 static const struct xenbus_device_id xen_driver_ids[] = {
diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c
@@ -51,7 +51,7 @@ module_param_array(ptr_size, int, NULL, 0444);
 MODULE_PARM_DESC(ptr_size,
 	"Pointing device width, height in pixels (default 800,600)");
 
-static int xenkbd_remove(struct xenbus_device *);
+static void xenkbd_remove(struct xenbus_device *);
 static int xenkbd_connect_backend(struct xenbus_device *, struct xenkbd_info *);
 static void xenkbd_disconnect_backend(struct xenkbd_info *);
 
@@ -404,7 +404,7 @@ static int xenkbd_resume(struct xenbus_device *dev)
 	return xenkbd_connect_backend(dev, info);
 }
 
-static int xenkbd_remove(struct xenbus_device *dev)
+static void xenkbd_remove(struct xenbus_device *dev)
 {
 	struct xenkbd_info *info = dev_get_drvdata(&dev->dev);
 
@@ -417,7 +417,6 @@ static int xenkbd_remove(struct xenbus_device *dev)
 		input_unregister_device(info->mtouch);
 	free_page((unsigned long)info->page);
 	kfree(info);
-	return 0;
 }
 
 static int xenkbd_connect_backend(struct xenbus_device *dev,
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
@@ -977,7 +977,7 @@ static int read_xenbus_vif_flags(struct backend_info *be)
 	return 0;
 }
 
-static int netback_remove(struct xenbus_device *dev)
+static void netback_remove(struct xenbus_device *dev)
 {
 	struct backend_info *be = dev_get_drvdata(&dev->dev);
 
@@ -992,7 +992,6 @@ static int netback_remove(struct xenbus_device *dev)
 	kfree(be->hotplug_script);
 	kfree(be);
 	dev_set_drvdata(&dev->dev, NULL);
-	return 0;
 }
 
 /*
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
@@ -2646,7 +2646,7 @@ static void xennet_bus_close(struct xenbus_device *dev)
 	} while (!ret);
 }
 
-static int xennet_remove(struct xenbus_device *dev)
+static void xennet_remove(struct xenbus_device *dev)
 {
 	struct netfront_info *info = dev_get_drvdata(&dev->dev);
 
@@ -2662,8 +2662,6 @@ static int xennet_remove(struct xenbus_device *dev)
 		rtnl_unlock();
 	}
 	xennet_free_netdev(info->netdev);
-
-	return 0;
 }
 
 static const struct xenbus_device_id netfront_ids[] = {
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
@@ -1055,14 +1055,12 @@ static int pcifront_xenbus_probe(struct xenbus_device *xdev,
 	return err;
 }
 
-static int pcifront_xenbus_remove(struct xenbus_device *xdev)
+static void pcifront_xenbus_remove(struct xenbus_device *xdev)
 {
 	struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev);
 
 	if (pdev)
 		free_pdev(pdev);
-
-	return 0;
 }
 
 static const struct xenbus_device_id xenpci_ids[] = {
diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c
@@ -995,7 +995,7 @@ static int scsifront_suspend(struct xenbus_device *dev)
 	return err;
 }
 
-static int scsifront_remove(struct xenbus_device *dev)
+static void scsifront_remove(struct xenbus_device *dev)
 {
 	struct vscsifrnt_info *info = dev_get_drvdata(&dev->dev);
 
@@ -1011,8 +1011,6 @@ static int scsifront_remove(struct xenbus_device *dev)
 
 	scsifront_free_ring(info);
 	scsi_host_put(info->host);
-
-	return 0;
 }
 
 static void scsifront_disconnect(struct vscsifrnt_info *info)
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
@@ -52,17 +52,22 @@ static DEFINE_SPINLOCK(xencons_lock);
 
 static struct xencons_info *vtermno_to_xencons(int vtermno)
 {
-	struct xencons_info *entry, *n, *ret = NULL;
+	struct xencons_info *entry, *ret = NULL;
+	unsigned long flags;
 
-	if (list_empty(&xenconsoles))
-			return NULL;
+	spin_lock_irqsave(&xencons_lock, flags);
+	if (list_empty(&xenconsoles)) {
+		spin_unlock_irqrestore(&xencons_lock, flags);
+		return NULL;
+	}
 
-	list_for_each_entry_safe(entry, n, &xenconsoles, list) {
+	list_for_each_entry(entry, &xenconsoles, list) {
 		if (entry->vtermno == vtermno) {
 			ret  = entry;
 			break;
 		}
 	}
+	spin_unlock_irqrestore(&xencons_lock, flags);
 
 	return ret;
 }
@@ -223,7 +228,7 @@ static int xen_hvm_console_init(void)
 {
 	int r;
 	uint64_t v = 0;
-	unsigned long gfn;
+	unsigned long gfn, flags;
 	struct xencons_info *info;
 
 	if (!xen_hvm_domain())
@@ -258,9 +263,9 @@ static int xen_hvm_console_init(void)
 		goto err;
 	info->vtermno = HVC_COOKIE;
 
-	spin_lock(&xencons_lock);
+	spin_lock_irqsave(&xencons_lock, flags);
 	list_add_tail(&info->list, &xenconsoles);
-	spin_unlock(&xencons_lock);
+	spin_unlock_irqrestore(&xencons_lock, flags);
 
 	return 0;
 err:
@@ -283,6 +288,7 @@ static int xencons_info_pv_init(struct xencons_info *info, int vtermno)
 static int xen_pv_console_init(void)
 {
 	struct xencons_info *info;
+	unsigned long flags;
 
 	if (!xen_pv_domain())
 		return -ENODEV;
@@ -299,16 +305,17 @@ static int xen_pv_console_init(void)
 		/* already configured */
 		return 0;
 	}
-	spin_lock(&xencons_lock);
+	spin_lock_irqsave(&xencons_lock, flags);
 	xencons_info_pv_init(info, HVC_COOKIE);
-	spin_unlock(&xencons_lock);
+	spin_unlock_irqrestore(&xencons_lock, flags);
 
 	return 0;
 }
 
 static int xen_initial_domain_console_init(void)
 {
 	struct xencons_info *info;
+	unsigned long flags;
 
 	if (!xen_initial_domain())
 		return -ENODEV;
@@ -323,9 +330,9 @@ static int xen_initial_domain_console_init(void)
 	info->irq = bind_virq_to_irq(VIRQ_CONSOLE, 0, false);
 	info->vtermno = HVC_COOKIE;
 
-	spin_lock(&xencons_lock);
+	spin_lock_irqsave(&xencons_lock, flags);
 	list_add_tail(&info->list, &xenconsoles);
-	spin_unlock(&xencons_lock);
+	spin_unlock_irqrestore(&xencons_lock, flags);
 
 	return 0;
 }
@@ -380,10 +387,12 @@ static void xencons_free(struct xencons_info *info)
 
 static int xen_console_remove(struct xencons_info *info)
 {
+	unsigned long flags;
+
 	xencons_disconnect_backend(info);
-	spin_lock(&xencons_lock);
+	spin_lock_irqsave(&xencons_lock, flags);
 	list_del(&info->list);
-	spin_unlock(&xencons_lock);
+	spin_unlock_irqrestore(&xencons_lock, flags);
 	if (info->xbdev != NULL)
 		xencons_free(info);
 	else {
@@ -394,9 +403,9 @@ static int xen_console_remove(struct xencons_info *info)
 	return 0;
 }
 
-static int xencons_remove(struct xenbus_device *dev)
+static void xencons_remove(struct xenbus_device *dev)
 {
-	return xen_console_remove(dev_get_drvdata(&dev->dev));
+	xen_console_remove(dev_get_drvdata(&dev->dev));
 }
 
 static int xencons_connect_backend(struct xenbus_device *dev,
@@ -464,6 +473,7 @@ static int xencons_probe(struct xenbus_device *dev,
 {
 	int ret, devid;
 	struct xencons_info *info;
+	unsigned long flags;
 
 	devid = dev->nodename[strlen(dev->nodename) - 1] - '0';
 	if (devid == 0)
@@ -482,9 +492,9 @@ static int xencons_probe(struct xenbus_device *dev,
 	ret = xencons_connect_backend(dev, info);
 	if (ret < 0)
 		goto error;
-	spin_lock(&xencons_lock);
+	spin_lock_irqsave(&xencons_lock, flags);
 	list_add_tail(&info->list, &xenconsoles);
-	spin_unlock(&xencons_lock);
+	spin_unlock_irqrestore(&xencons_lock, flags);
 
 	return 0;
 
@@ -584,10 +594,12 @@ static int __init xen_hvc_init(void)
 
 	info->hvc = hvc_alloc(HVC_COOKIE, info->irq, ops, 256);
 	if (IS_ERR(info->hvc)) {
+		unsigned long flags;
+
 		r = PTR_ERR(info->hvc);
-		spin_lock(&xencons_lock);
+		spin_lock_irqsave(&xencons_lock, flags);
 		list_del(&info->list);
-		spin_unlock(&xencons_lock);
+		spin_unlock_irqrestore(&xencons_lock, flags);
 		if (info->irq)
 			unbind_from_irqhandler(info->irq, NULL);
 		kfree(info);
diff --git a/drivers/usb/host/xen-hcd.c b/drivers/usb/host/xen-hcd.c
@@ -1530,15 +1530,13 @@ static void xenhcd_backend_changed(struct xenbus_device *dev,
 	}
 }
 
-static int xenhcd_remove(struct xenbus_device *dev)
+static void xenhcd_remove(struct xenbus_device *dev)
 {
 	struct xenhcd_info *info = dev_get_drvdata(&dev->dev);
 	struct usb_hcd *hcd = xenhcd_info_to_hcd(info);
 
 	xenhcd_destroy_rings(info);
 	usb_put_hcd(hcd);
-
-	return 0;
 }
 
 static int xenhcd_probe(struct xenbus_device *dev,
diff --git a/drivers/video/fbdev/xen-fbfront.c b/drivers/video/fbdev/xen-fbfront.c
@@ -67,7 +67,7 @@ MODULE_PARM_DESC(video,
 	"Video memory size in MB, width, height in pixels (default 2,800,600)");
 
 static void xenfb_make_preferred_console(void);
-static int xenfb_remove(struct xenbus_device *);
+static void xenfb_remove(struct xenbus_device *);
 static void xenfb_init_shared_page(struct xenfb_info *, struct fb_info *);
 static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info *);
 static void xenfb_disconnect_backend(struct xenfb_info *);
@@ -523,7 +523,7 @@ static int xenfb_resume(struct xenbus_device *dev)
 	return xenfb_connect_backend(dev, info);
 }
 
-static int xenfb_remove(struct xenbus_device *dev)
+static void xenfb_remove(struct xenbus_device *dev)
 {
 	struct xenfb_info *info = dev_get_drvdata(&dev->dev);
 
@@ -538,8 +538,6 @@ static int xenfb_remove(struct xenbus_device *dev)
 	vfree(info->gfns);
 	vfree(info->fb);
 	kfree(info);
-
-	return 0;
 }
 
 static unsigned long vmalloc_to_gfn(void *address)
diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c
@@ -1181,9 +1181,8 @@ static void pvcalls_back_changed(struct xenbus_device *dev,
 	}
 }
 
-static int pvcalls_back_remove(struct xenbus_device *dev)
+static void pvcalls_back_remove(struct xenbus_device *dev)
 {
-	return 0;
 }
 
 static int pvcalls_back_uevent(struct xenbus_device *xdev,
diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c
diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c
diff --git a/sound/xen/xen_snd_front.c b/sound/xen/xen_snd_front.c

Original file line number	Diff line number	Diff line change
`@@ -134,11 +134,6 @@ static inline unsigned p2m_mid_index(unsigned long pfn)`
`134`	`134`	`return (pfn / P2M_PER_PAGE) % P2M_MID_PER_PAGE;`
`135`	`135`	`}`
`136`	`136`
`137`		`-static inline unsigned p2m_index(unsigned long pfn)`
`138`		`-{`
`139`		`- return pfn % P2M_PER_PAGE;`
`140`		`-}`
`141`		`-`
`142`	`137`	`static void p2m_top_mfn_init(unsigned long *top)`
`143`	`138`	`{`
`144`	`139`	`unsigned i;`
Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,`
`524`	`524`	`return 0;`
`525`	`525`	`}`
`526`	`526`
`527`		`-static int xen_blkbk_remove(struct xenbus_device *dev)`
	`527`	`+static void xen_blkbk_remove(struct xenbus_device *dev)`
`528`	`528`	`{`
`529`	`529`	`struct backend_info *be = dev_get_drvdata(&dev->dev);`
`530`	`530`
`@@ -547,8 +547,6 @@ static int xen_blkbk_remove(struct xenbus_device *dev)`
`547`	`547`	`/* Put the reference we set in xen_blkif_alloc(). */`
`548`	`548`	`xen_blkif_put(be->blkif);`
`549`	`549`	`}`
`550`		`-`
`551`		`- return 0;`
`552`	`550`	`}`
`553`	`551`
`554`	`552`	`int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt,`
Original file line number	Diff line number	Diff line change
`@@ -2467,7 +2467,7 @@ static void blkback_changed(struct xenbus_device *dev,`
`2467`	`2467`	`}`
`2468`	`2468`	`}`
`2469`	`2469`
`2470`		`-static int blkfront_remove(struct xenbus_device *xbdev)`
	`2470`	`+static void blkfront_remove(struct xenbus_device *xbdev)`
`2471`	`2471`	`{`
`2472`	`2472`	`struct blkfront_info *info = dev_get_drvdata(&xbdev->dev);`
`2473`	`2473`
`@@ -2488,7 +2488,6 @@ static int blkfront_remove(struct xenbus_device *xbdev)`
`2488`	`2488`	`}`
`2489`	`2489`
`2490`	`2490`	`kfree(info);`
`2491`		`- return 0;`
`2492`	`2491`	`}`
`2493`	`2492`
`2494`	`2493`	`static int blkfront_is_ready(struct xenbus_device *dev)`
Original file line number	Diff line number	Diff line change
`@@ -360,14 +360,13 @@ static int tpmfront_probe(struct xenbus_device *dev,`
`360`	`360`	`return tpm_chip_register(priv->chip);`
`361`	`361`	`}`
`362`	`362`
`363`		`-static int tpmfront_remove(struct xenbus_device *dev)`
	`363`	`+static void tpmfront_remove(struct xenbus_device *dev)`
`364`	`364`	`{`
`365`	`365`	`struct tpm_chip *chip = dev_get_drvdata(&dev->dev);`
`366`	`366`	`struct tpm_private *priv = dev_get_drvdata(&chip->dev);`
`367`	`367`	`tpm_chip_unregister(chip);`
`368`	`368`	`ring_free(priv);`
`369`	`369`	`dev_set_drvdata(&chip->dev, NULL);`
`370`		`- return 0;`
`371`	`370`	`}`
`372`	`371`
`373`	`372`	`static int tpmfront_resume(struct xenbus_device *dev)`
Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev,`
`717`	`717`	`return xenbus_switch_state(xb_dev, XenbusStateInitialising);`
`718`	`718`	`}`
`719`	`719`
`720`		`-static int xen_drv_remove(struct xenbus_device *dev)`
	`720`	`+static void xen_drv_remove(struct xenbus_device *dev)`
`721`	`721`	`{`
`722`	`722`	`struct xen_drm_front_info *front_info = dev_get_drvdata(&dev->dev);`
`723`	`723`	`int to = 100;`
`@@ -751,7 +751,6 @@ static int xen_drv_remove(struct xenbus_device *dev)`
`751`	`751`
`752`	`752`	`xen_drm_drv_fini(front_info);`
`753`	`753`	`xenbus_frontend_closed(dev);`
`754`		`- return 0;`
`755`	`754`	`}`
`756`	`755`
`757`	`756`	`static const struct xenbus_device_id xen_driver_ids[] = {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ module_param_array(ptr_size, int, NULL, 0444);`
`51`	`51`	`MODULE_PARM_DESC(ptr_size,`
`52`	`52`	`"Pointing device width, height in pixels (default 800,600)");`
`53`	`53`
`54`		`-static int xenkbd_remove(struct xenbus_device *);`
	`54`	`+static void xenkbd_remove(struct xenbus_device *);`
`55`	`55`	`static int xenkbd_connect_backend(struct xenbus_device , struct xenkbd_info );`
`56`	`56`	`static void xenkbd_disconnect_backend(struct xenkbd_info *);`
`57`	`57`
`@@ -404,7 +404,7 @@ static int xenkbd_resume(struct xenbus_device *dev)`
`404`	`404`	`return xenkbd_connect_backend(dev, info);`
`405`	`405`	`}`
`406`	`406`
`407`		`-static int xenkbd_remove(struct xenbus_device *dev)`
	`407`	`+static void xenkbd_remove(struct xenbus_device *dev)`
`408`	`408`	`{`
`409`	`409`	`struct xenkbd_info *info = dev_get_drvdata(&dev->dev);`
`410`	`410`
`@@ -417,7 +417,6 @@ static int xenkbd_remove(struct xenbus_device *dev)`
`417`	`417`	`input_unregister_device(info->mtouch);`
`418`	`418`	`free_page((unsigned long)info->page);`
`419`	`419`	`kfree(info);`
`420`		`- return 0;`
`421`	`420`	`}`
`422`	`421`
`423`	`422`	`static int xenkbd_connect_backend(struct xenbus_device *dev,`
Original file line number	Diff line number	Diff line change
`@@ -977,7 +977,7 @@ static int read_xenbus_vif_flags(struct backend_info *be)`
`977`	`977`	`return 0;`
`978`	`978`	`}`
`979`	`979`
`980`		`-static int netback_remove(struct xenbus_device *dev)`
	`980`	`+static void netback_remove(struct xenbus_device *dev)`
`981`	`981`	`{`
`982`	`982`	`struct backend_info *be = dev_get_drvdata(&dev->dev);`
`983`	`983`
`@@ -992,7 +992,6 @@ static int netback_remove(struct xenbus_device *dev)`
`992`	`992`	`kfree(be->hotplug_script);`
`993`	`993`	`kfree(be);`
`994`	`994`	`dev_set_drvdata(&dev->dev, NULL);`
`995`		`- return 0;`
`996`	`995`	`}`
`997`	`996`
`998`	`997`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -2646,7 +2646,7 @@ static void xennet_bus_close(struct xenbus_device *dev)`
`2646`	`2646`	`} while (!ret);`
`2647`	`2647`	`}`
`2648`	`2648`
`2649`		`-static int xennet_remove(struct xenbus_device *dev)`
	`2649`	`+static void xennet_remove(struct xenbus_device *dev)`
`2650`	`2650`	`{`
`2651`	`2651`	`struct netfront_info *info = dev_get_drvdata(&dev->dev);`
`2652`	`2652`
`@@ -2662,8 +2662,6 @@ static int xennet_remove(struct xenbus_device *dev)`
`2662`	`2662`	`rtnl_unlock();`
`2663`	`2663`	`}`
`2664`	`2664`	`xennet_free_netdev(info->netdev);`
`2665`		`-`
`2666`		`- return 0;`
`2667`	`2665`	`}`
`2668`	`2666`
`2669`	`2667`	`static const struct xenbus_device_id netfront_ids[] = {`
Original file line number	Diff line number	Diff line change
`@@ -1055,14 +1055,12 @@ static int pcifront_xenbus_probe(struct xenbus_device *xdev,`
`1055`	`1055`	`return err;`
`1056`	`1056`	`}`
`1057`	`1057`
`1058`		`-static int pcifront_xenbus_remove(struct xenbus_device *xdev)`
	`1058`	`+static void pcifront_xenbus_remove(struct xenbus_device *xdev)`
`1059`	`1059`	`{`
`1060`	`1060`	`struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev);`
`1061`	`1061`
`1062`	`1062`	`if (pdev)`
`1063`	`1063`	`free_pdev(pdev);`
`1064`		`-`
`1065`		`- return 0;`
`1066`	`1064`	`}`
`1067`	`1065`
`1068`	`1066`	`static const struct xenbus_device_id xenpci_ids[] = {`
Original file line number	Diff line number	Diff line change
`@@ -995,7 +995,7 @@ static int scsifront_suspend(struct xenbus_device *dev)`
`995`	`995`	`return err;`
`996`	`996`	`}`
`997`	`997`
`998`		`-static int scsifront_remove(struct xenbus_device *dev)`
	`998`	`+static void scsifront_remove(struct xenbus_device *dev)`
`999`	`999`	`{`
`1000`	`1000`	`struct vscsifrnt_info *info = dev_get_drvdata(&dev->dev);`
`1001`	`1001`
`@@ -1011,8 +1011,6 @@ static int scsifront_remove(struct xenbus_device *dev)`
`1011`	`1011`
`1012`	`1012`	`scsifront_free_ring(info);`
`1013`	`1013`	`scsi_host_put(info->host);`
`1014`		`-`
`1015`		`- return 0;`
`1016`	`1014`	`}`
`1017`	`1015`
`1018`	`1016`	`static void scsifront_disconnect(struct vscsifrnt_info *info)`