Commit f3933545 authored by Eric Van Hensbergen's avatar Eric Van Hensbergen Committed by Eric Van Hensbergen

9p: add remove function to trans_virtio

Request from rusty:
Just cleaning up patches for 2.6.25 merge, and noticed that
net/9p/trans_virtio.c doesn't have a remove function.  This will crash when
removing the module (console doesn't have one because it can't really be
removed).
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent dea7bbb6
...@@ -385,6 +385,18 @@ static struct p9_trans *p9_virtio_create(const char *devname, char *args) ...@@ -385,6 +385,18 @@ static struct p9_trans *p9_virtio_create(const char *devname, char *args)
return trans; return trans;
} }
static void p9_virtio_remove(struct virtio_device *vdev)
{
struct virtio_chan *chan = vdev->priv;
BUG_ON(chan->inuse);
if (chan->initialized) {
vdev->config->del_vq(chan->vq);
chan->initialized = false;
}
}
#define VIRTIO_ID_9P 9 #define VIRTIO_ID_9P 9
static struct virtio_device_id id_table[] = { static struct virtio_device_id id_table[] = {
...@@ -398,6 +410,7 @@ static struct virtio_driver p9_virtio_drv = { ...@@ -398,6 +410,7 @@ static struct virtio_driver p9_virtio_drv = {
.driver.owner = THIS_MODULE, .driver.owner = THIS_MODULE,
.id_table = id_table, .id_table = id_table,
.probe = p9_virtio_probe, .probe = p9_virtio_probe,
.remove = p9_virtio_remove,
}; };
static struct p9_trans_module p9_virtio_trans = { static struct p9_trans_module p9_virtio_trans = {
...@@ -419,7 +432,13 @@ static int __init p9_virtio_init(void) ...@@ -419,7 +432,13 @@ static int __init p9_virtio_init(void)
return register_virtio_driver(&p9_virtio_drv); return register_virtio_driver(&p9_virtio_drv);
} }
static void __exit p9_virtio_cleanup(void)
{
unregister_virtio_driver(&p9_virtio_drv);
}
module_init(p9_virtio_init); module_init(p9_virtio_init);
module_exit(p9_virtio_cleanup);
MODULE_DEVICE_TABLE(virtio, id_table); MODULE_DEVICE_TABLE(virtio, id_table);
MODULE_AUTHOR("Eric Van Hensbergen <ericvh@gmail.com>"); MODULE_AUTHOR("Eric Van Hensbergen <ericvh@gmail.com>");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment