Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 7cffcade 编写于 作者: D Dawei Li 提交者： Juergen Gross
浏览文件
操作

xen: make remove callback of xen driver void returned 

Since commit fc7a6209 ("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.

This change is for xen bus based drivers.
Acked-by: NJuergen Gross <jgross@suse.com>
Signed-off-by: NDawei Li <set_pte_at@outlook.com>
Link: https://lore.kernel.org/r/TYCP286MB23238119AB4DF190997075C9CAE39@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COMSigned-off-by: NJuergen Gross <jgross@suse.com>
上级 8b997b2b
隐藏空白更改
内联 并排
Showing with 22 addition and 47 deletion
drivers/block/xen-blkback/xenbus.c
浏览文件 @ 7cffcade
...@@ -524,7 +524,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle, ...@@ -524,7 +524,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,
return 0; 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); struct backend_info *be = dev_get_drvdata(&dev->dev);
...@@ -547,8 +547,6 @@ static int xen_blkbk_remove(struct xenbus_device *dev) ...@@ -547,8 +547,6 @@ static int xen_blkbk_remove(struct xenbus_device *dev)
/* Put the reference we set in xen_blkif_alloc(). */ /* Put the reference we set in xen_blkif_alloc(). */
xen_blkif_put(be->blkif); xen_blkif_put(be->blkif);
} }
return 0;
} }
int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt, int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt,
......
drivers/block/xen-blkfront.c
浏览文件 @ 7cffcade
...@@ -2468,7 +2468,7 @@ static void blkback_changed(struct xenbus_device *dev, ...@@ -2468,7 +2468,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); struct blkfront_info *info = dev_get_drvdata(&xbdev->dev);
...@@ -2489,7 +2489,6 @@ static int blkfront_remove(struct xenbus_device *xbdev) ...@@ -2489,7 +2489,6 @@ static int blkfront_remove(struct xenbus_device *xbdev)
} }
kfree(info); kfree(info);
return 0;
} }
static int blkfront_is_ready(struct xenbus_device *dev) static int blkfront_is_ready(struct xenbus_device *dev)
......
drivers/char/tpm/xen-tpmfront.c
浏览文件 @ 7cffcade
...@@ -360,14 +360,13 @@ static int tpmfront_probe(struct xenbus_device *dev, ...@@ -360,14 +360,13 @@ static int tpmfront_probe(struct xenbus_device *dev,
return tpm_chip_register(priv->chip); 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_chip *chip = dev_get_drvdata(&dev->dev);
struct tpm_private *priv = dev_get_drvdata(&chip->dev); struct tpm_private *priv = dev_get_drvdata(&chip->dev);
tpm_chip_unregister(chip); tpm_chip_unregister(chip);
ring_free(priv); ring_free(priv);
dev_set_drvdata(&chip->dev, NULL); dev_set_drvdata(&chip->dev, NULL);
return 0;
} }
static int tpmfront_resume(struct xenbus_device *dev) static int tpmfront_resume(struct xenbus_device *dev)
......
drivers/gpu/drm/xen/xen_drm_front.c
浏览文件 @ 7cffcade
...@@ -717,7 +717,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev, ...@@ -717,7 +717,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev,
return xenbus_switch_state(xb_dev, XenbusStateInitialising); 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); struct xen_drm_front_info *front_info = dev_get_drvdata(&dev->dev);
int to = 100; int to = 100;
...@@ -751,7 +751,6 @@ static int xen_drv_remove(struct xenbus_device *dev) ...@@ -751,7 +751,6 @@ static int xen_drv_remove(struct xenbus_device *dev)
xen_drm_drv_fini(front_info); xen_drm_drv_fini(front_info);
xenbus_frontend_closed(dev); xenbus_frontend_closed(dev);
return 0;
} }
static const struct xenbus_device_id xen_driver_ids[] = { static const struct xenbus_device_id xen_driver_ids[] = {
......
drivers/input/misc/xen-kbdfront.c
浏览文件 @ 7cffcade
...@@ -51,7 +51,7 @@ module_param_array(ptr_size, int, NULL, 0444); ...@@ -51,7 +51,7 @@ module_param_array(ptr_size, int, NULL, 0444);
MODULE_PARM_DESC(ptr_size, MODULE_PARM_DESC(ptr_size,
"Pointing device width, height in pixels (default 800,600)"); "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 int xenkbd_connect_backend(struct xenbus_device *, struct xenkbd_info *);
static void xenkbd_disconnect_backend(struct xenkbd_info *); static void xenkbd_disconnect_backend(struct xenkbd_info *);
...@@ -404,7 +404,7 @@ static int xenkbd_resume(struct xenbus_device *dev) ...@@ -404,7 +404,7 @@ static int xenkbd_resume(struct xenbus_device *dev)
return xenkbd_connect_backend(dev, info); 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); struct xenkbd_info *info = dev_get_drvdata(&dev->dev);
...@@ -417,7 +417,6 @@ static int xenkbd_remove(struct xenbus_device *dev) ...@@ -417,7 +417,6 @@ static int xenkbd_remove(struct xenbus_device *dev)
input_unregister_device(info->mtouch); input_unregister_device(info->mtouch);
free_page((unsigned long)info->page); free_page((unsigned long)info->page);
kfree(info); kfree(info);
return 0;
} }
static int xenkbd_connect_backend(struct xenbus_device *dev, static int xenkbd_connect_backend(struct xenbus_device *dev,
......
drivers/net/xen-netback/xenbus.c
浏览文件 @ 7cffcade
...@@ -977,7 +977,7 @@ static int read_xenbus_vif_flags(struct backend_info *be) ...@@ -977,7 +977,7 @@ static int read_xenbus_vif_flags(struct backend_info *be)
return 0; 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); struct backend_info *be = dev_get_drvdata(&dev->dev);
...@@ -992,7 +992,6 @@ static int netback_remove(struct xenbus_device *dev) ...@@ -992,7 +992,6 @@ static int netback_remove(struct xenbus_device *dev)
kfree(be->hotplug_script); kfree(be->hotplug_script);
kfree(be); kfree(be);
dev_set_drvdata(&dev->dev, NULL); dev_set_drvdata(&dev->dev, NULL);
return 0;
} }
/* /*
......
drivers/net/xen-netfront.c
浏览文件 @ 7cffcade
...@@ -2640,7 +2640,7 @@ static void xennet_bus_close(struct xenbus_device *dev) ...@@ -2640,7 +2640,7 @@ static void xennet_bus_close(struct xenbus_device *dev)
} while (!ret); } 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); struct netfront_info *info = dev_get_drvdata(&dev->dev);
...@@ -2656,8 +2656,6 @@ static int xennet_remove(struct xenbus_device *dev) ...@@ -2656,8 +2656,6 @@ static int xennet_remove(struct xenbus_device *dev)
rtnl_unlock(); rtnl_unlock();
} }
xennet_free_netdev(info->netdev); xennet_free_netdev(info->netdev);
return 0;
} }
static const struct xenbus_device_id netfront_ids[] = { static const struct xenbus_device_id netfront_ids[] = {
......
drivers/pci/xen-pcifront.c
浏览文件 @ 7cffcade
...@@ -1055,14 +1055,12 @@ static int pcifront_xenbus_probe(struct xenbus_device *xdev, ...@@ -1055,14 +1055,12 @@ static int pcifront_xenbus_probe(struct xenbus_device *xdev,
return err; 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); struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev);
if (pdev) if (pdev)
free_pdev(pdev); free_pdev(pdev);
return 0;
} }
static const struct xenbus_device_id xenpci_ids[] = { static const struct xenbus_device_id xenpci_ids[] = {
......
drivers/scsi/xen-scsifront.c
浏览文件 @ 7cffcade
...@@ -995,7 +995,7 @@ static int scsifront_suspend(struct xenbus_device *dev) ...@@ -995,7 +995,7 @@ static int scsifront_suspend(struct xenbus_device *dev)
return err; 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); struct vscsifrnt_info *info = dev_get_drvdata(&dev->dev);
...@@ -1011,8 +1011,6 @@ static int scsifront_remove(struct xenbus_device *dev) ...@@ -1011,8 +1011,6 @@ static int scsifront_remove(struct xenbus_device *dev)
scsifront_free_ring(info); scsifront_free_ring(info);
scsi_host_put(info->host); scsi_host_put(info->host);
return 0;
} }
static void scsifront_disconnect(struct vscsifrnt_info *info) static void scsifront_disconnect(struct vscsifrnt_info *info)
......
drivers/tty/hvc/hvc_xen.c
浏览文件 @ 7cffcade
...@@ -394,9 +394,9 @@ static int xen_console_remove(struct xencons_info *info) ...@@ -394,9 +394,9 @@ static int xen_console_remove(struct xencons_info *info)
return 0; 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, static int xencons_connect_backend(struct xenbus_device *dev,
......
drivers/usb/host/xen-hcd.c
浏览文件 @ 7cffcade
...@@ -1530,15 +1530,13 @@ static void xenhcd_backend_changed(struct xenbus_device *dev, ...@@ -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 xenhcd_info *info = dev_get_drvdata(&dev->dev);
struct usb_hcd *hcd = xenhcd_info_to_hcd(info); struct usb_hcd *hcd = xenhcd_info_to_hcd(info);
xenhcd_destroy_rings(info); xenhcd_destroy_rings(info);
usb_put_hcd(hcd); usb_put_hcd(hcd);
return 0;
} }
static int xenhcd_probe(struct xenbus_device *dev, static int xenhcd_probe(struct xenbus_device *dev,
......
drivers/video/fbdev/xen-fbfront.c
浏览文件 @ 7cffcade
...@@ -67,7 +67,7 @@ MODULE_PARM_DESC(video, ...@@ -67,7 +67,7 @@ MODULE_PARM_DESC(video,
"Video memory size in MB, width, height in pixels (default 2,800,600)"); "Video memory size in MB, width, height in pixels (default 2,800,600)");
static void xenfb_make_preferred_console(void); 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 void xenfb_init_shared_page(struct xenfb_info *, struct fb_info *);
static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info *); static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info *);
static void xenfb_disconnect_backend(struct xenfb_info *); static void xenfb_disconnect_backend(struct xenfb_info *);
...@@ -527,7 +527,7 @@ static int xenfb_resume(struct xenbus_device *dev) ...@@ -527,7 +527,7 @@ static int xenfb_resume(struct xenbus_device *dev)
return xenfb_connect_backend(dev, info); 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); struct xenfb_info *info = dev_get_drvdata(&dev->dev);
...@@ -542,8 +542,6 @@ static int xenfb_remove(struct xenbus_device *dev) ...@@ -542,8 +542,6 @@ static int xenfb_remove(struct xenbus_device *dev)
vfree(info->gfns); vfree(info->gfns);
vfree(info->fb); vfree(info->fb);
kfree(info); kfree(info);
return 0;
} }
static unsigned long vmalloc_to_gfn(void *address) static unsigned long vmalloc_to_gfn(void *address)
......
drivers/xen/pvcalls-back.c
浏览文件 @ 7cffcade
...@@ -1181,9 +1181,8 @@ static void pvcalls_back_changed(struct xenbus_device *dev, ...@@ -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, static int pvcalls_back_uevent(struct xenbus_device *xdev,
......
drivers/xen/pvcalls-front.c
浏览文件 @ 7cffcade
...@@ -1085,7 +1085,7 @@ static const struct xenbus_device_id pvcalls_front_ids[] = { ...@@ -1085,7 +1085,7 @@ static const struct xenbus_device_id pvcalls_front_ids[] = {
{ "" } { "" }
}; };
static int pvcalls_front_remove(struct xenbus_device *dev) static void pvcalls_front_remove(struct xenbus_device *dev)
{ {
struct pvcalls_bedata *bedata; struct pvcalls_bedata *bedata;
struct sock_mapping *map = NULL, *n; struct sock_mapping *map = NULL, *n;
...@@ -1121,7 +1121,6 @@ static int pvcalls_front_remove(struct xenbus_device *dev) ...@@ -1121,7 +1121,6 @@ static int pvcalls_front_remove(struct xenbus_device *dev)
kfree(bedata->ring.sring); kfree(bedata->ring.sring);
kfree(bedata); kfree(bedata);
xenbus_switch_state(dev, XenbusStateClosed); xenbus_switch_state(dev, XenbusStateClosed);
return 0;
} }
static int pvcalls_front_probe(struct xenbus_device *dev, static int pvcalls_front_probe(struct xenbus_device *dev,
......
drivers/xen/xen-pciback/xenbus.c
浏览文件 @ 7cffcade
...@@ -716,14 +716,12 @@ static int xen_pcibk_xenbus_probe(struct xenbus_device *dev, ...@@ -716,14 +716,12 @@ static int xen_pcibk_xenbus_probe(struct xenbus_device *dev,
return err; return err;
} }
static int xen_pcibk_xenbus_remove(struct xenbus_device *dev) static void xen_pcibk_xenbus_remove(struct xenbus_device *dev)
{ {
struct xen_pcibk_device *pdev = dev_get_drvdata(&dev->dev); struct xen_pcibk_device *pdev = dev_get_drvdata(&dev->dev);
if (pdev != NULL) if (pdev != NULL)
free_pdev(pdev); free_pdev(pdev);
return 0;
} }
static const struct xenbus_device_id xen_pcibk_ids[] = { static const struct xenbus_device_id xen_pcibk_ids[] = {
......
drivers/xen/xen-scsiback.c
浏览文件 @ 7cffcade
...@@ -1249,7 +1249,7 @@ static void scsiback_release_translation_entry(struct vscsibk_info *info) ...@@ -1249,7 +1249,7 @@ static void scsiback_release_translation_entry(struct vscsibk_info *info)
spin_unlock_irqrestore(&info->v2p_lock, flags); spin_unlock_irqrestore(&info->v2p_lock, flags);
} }
static int scsiback_remove(struct xenbus_device *dev) static void scsiback_remove(struct xenbus_device *dev)
{ {
struct vscsibk_info *info = dev_get_drvdata(&dev->dev); struct vscsibk_info *info = dev_get_drvdata(&dev->dev);
...@@ -1261,8 +1261,6 @@ static int scsiback_remove(struct xenbus_device *dev) ...@@ -1261,8 +1261,6 @@ static int scsiback_remove(struct xenbus_device *dev)
gnttab_page_cache_shrink(&info->free_pages, 0); gnttab_page_cache_shrink(&info->free_pages, 0);
dev_set_drvdata(&dev->dev, NULL); dev_set_drvdata(&dev->dev, NULL);
return 0;
} }
static int scsiback_probe(struct xenbus_device *dev, static int scsiback_probe(struct xenbus_device *dev,
......
include/xen/xenbus.h
浏览文件 @ 7cffcade
...@@ -117,7 +117,7 @@ struct xenbus_driver { ...@@ -117,7 +117,7 @@ struct xenbus_driver {
const struct xenbus_device_id *id); const struct xenbus_device_id *id);
void (*otherend_changed)(struct xenbus_device *dev, void (*otherend_changed)(struct xenbus_device *dev,
enum xenbus_state backend_state); enum xenbus_state backend_state);
int (*remove)(struct xenbus_device *dev); void (*remove)(struct xenbus_device *dev);
int (*suspend)(struct xenbus_device *dev); int (*suspend)(struct xenbus_device *dev);
int (*resume)(struct xenbus_device *dev); int (*resume)(struct xenbus_device *dev);
int (*uevent)(struct xenbus_device *, struct kobj_uevent_env *); int (*uevent)(struct xenbus_device *, struct kobj_uevent_env *);
......
net/9p/trans_xen.c
浏览文件 @ 7cffcade
...@@ -303,13 +303,12 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv) ...@@ -303,13 +303,12 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv)
kfree(priv); kfree(priv);
} }
static int xen_9pfs_front_remove(struct xenbus_device *dev) static void xen_9pfs_front_remove(struct xenbus_device *dev)
{ {
struct xen_9pfs_front_priv *priv = dev_get_drvdata(&dev->dev); struct xen_9pfs_front_priv *priv = dev_get_drvdata(&dev->dev);
dev_set_drvdata(&dev->dev, NULL); dev_set_drvdata(&dev->dev, NULL);
xen_9pfs_front_free(priv); xen_9pfs_front_free(priv);
return 0;
} }
static int xen_9pfs_front_alloc_dataring(struct xenbus_device *dev, static int xen_9pfs_front_alloc_dataring(struct xenbus_device *dev,
......
sound/xen/xen_snd_front.c
浏览文件 @ 7cffcade
...@@ -311,7 +311,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev, ...@@ -311,7 +311,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev,
return xenbus_switch_state(xb_dev, XenbusStateInitialising); 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_snd_front_info *front_info = dev_get_drvdata(&dev->dev); struct xen_snd_front_info *front_info = dev_get_drvdata(&dev->dev);
int to = 100; int to = 100;
...@@ -345,7 +345,6 @@ static int xen_drv_remove(struct xenbus_device *dev) ...@@ -345,7 +345,6 @@ static int xen_drv_remove(struct xenbus_device *dev)
xen_snd_drv_fini(front_info); xen_snd_drv_fini(front_info);
xenbus_frontend_closed(dev); xenbus_frontend_closed(dev);
return 0;
} }
static const struct xenbus_device_id xen_drv_ids[] = { static const struct xenbus_device_id xen_drv_ids[] = {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或