virtio: console: Remove config work handler

We're going to switch to using control messages for port hot-plug and
initial port discovery. Remove the config work handler which handled
port hot-plug so far.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 9a69870..e1f92a0 100644 (file)
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -110,7 +110,6 @@ struct ports_device {
         * notification
         */
        struct work_struct control_work;
-       struct work_struct config_work;
 
        struct list_head ports;
 
@@ -1084,10 +1083,7 @@ static void config_intr(struct virtio_device *vdev)
        struct ports_device *portdev;
 
        portdev = vdev->priv;
-       if (use_multiport(portdev)) {
-               /* Handle port hot-add */
-               schedule_work(&portdev->config_work);
-       }
+
        /*
         * We'll use this way of resizing only for legacy support.
         * For newer userspace (VIRTIO_CONSOLE_F_MULTPORT+), use
@@ -1230,62 +1226,6 @@ fail:
        return err;
 }
 
-/*
- * The workhandler for config-space updates.
- *
- * This is called when ports are hot-added.
- */
-static void config_work_handler(struct work_struct *work)
-{
-       struct virtio_console_config virtconconf;
-       struct ports_device *portdev;
-       struct virtio_device *vdev;
-       int err;
-
-       portdev = container_of(work, struct ports_device, config_work);
-
-       vdev = portdev->vdev;
-       vdev->config->get(vdev,
-                         offsetof(struct virtio_console_config, nr_ports),
-                         &virtconconf.nr_ports,
-                         sizeof(virtconconf.nr_ports));
-
-       if (portdev->config.nr_ports == virtconconf.nr_ports) {
-               /*
-                * Port 0 got hot-added.  Since we already did all the
-                * other initialisation for it, just tell the Host
-                * that the port is ready if we find the port.  In
-                * case the port was hot-removed earlier, we call
-                * add_port to add the port.
-                */
-               struct port *port;
-
-               port = find_port_by_id(portdev, 0);
-               if (!port)
-                       add_port(portdev, 0);
-               else
-                       send_control_msg(port, VIRTIO_CONSOLE_PORT_READY, 1);
-               return;
-       }
-       if (virtconconf.nr_ports > portdev->config.max_nr_ports) {
-               dev_warn(&vdev->dev,
-                        "More ports specified (%u) than allowed (%u)",
-                        portdev->config.nr_ports + 1,
-                        portdev->config.max_nr_ports);
-               return;
-       }
-       if (virtconconf.nr_ports < portdev->config.nr_ports)
-               return;
-
-       /* Hot-add ports */
-       while (virtconconf.nr_ports - portdev->config.nr_ports) {
-               err = add_port(portdev, portdev->config.nr_ports);
-               if (err)
-                       break;
-               portdev->config.nr_ports++;
-       }
-}
-
 static int init_vqs(struct ports_device *portdev)
 {
        vq_callback_t **io_callbacks;
@@ -1478,7 +1418,6 @@ static int __devinit virtcons_probe(struct virtio_device *vdev)
 
                spin_lock_init(&portdev->cvq_lock);
                INIT_WORK(&portdev->control_work, &control_work_handler);
-               INIT_WORK(&portdev->config_work, &config_work_handler);
 
                nr_added_bufs = fill_queue(portdev->c_ivq, &portdev->cvq_lock);
                if (!nr_added_bufs) {
@@ -1521,7 +1460,6 @@ static void virtcons_remove(struct virtio_device *vdev)
        portdev = vdev->priv;
 
        cancel_work_sync(&portdev->control_work);
-       cancel_work_sync(&portdev->config_work);
 
        list_for_each_entry_safe(port, port2, &portdev->ports, list)
                remove_port(port);