Commit 3c834b6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull virtio updates from Rusty Russell:
 "All trivial, thanks to the stuff which didn't quite make it time"

* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  virtio_console: Initialize guest_connected=true for rproc_serial
  virtio: use module_virtio_driver.
  virtio: Add module driver macro for virtio drivers.
  virtio_console: Use virtio device index to generate port name
  virtio: make pci_device_id const
  virtio: make config_ops const
  virtio-mmio: fix wrong comment about register offset
  virtio_console: Let unconnected rproc device receive data.
parents 515d01f7 8078db78

drivers/char/hw_random/virtio-rng.c

+1 −12
Original line number Diff line number Diff line
@@ -154,18 +154,7 @@ static struct virtio_driver virtio_rng_driver = { 
#endif

};



static int __init init(void)

{

	return register_virtio_driver(&virtio_rng_driver);

}



static void __exit fini(void)

{

	unregister_virtio_driver(&virtio_rng_driver);

}

module_init(init);

module_exit(fini);



module_virtio_driver(virtio_rng_driver);

MODULE_DEVICE_TABLE(virtio, id_table);

MODULE_DESCRIPTION("Virtio random number driver");

MODULE_LICENSE("GPL");

drivers/char/virtio_console.c

+4 −14
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ struct ports_driver_data { 
	/* List of all the devices we're handling */

	struct list_head portdevs;



	/* Number of devices this driver is handling */

	unsigned int index;



	/*

	 * This is used to keep track of the number of hvc consoles

	 * spawned by this driver.  This number is given as the first
@@ -169,9 +166,6 @@ struct ports_device { 
	/* Array of per-port IO virtqueues */

	struct virtqueue **in_vqs, **out_vqs;



	/* Used for numbering devices for sysfs and debugfs */

	unsigned int drv_index;



	/* Major number for this device.  Ports will be created as minors. */

	int chr_major;

};
@@ -1415,7 +1409,7 @@ static int add_port(struct ports_device *portdev, u32 id) 
	}

	port->dev = device_create(pdrvdata.class, &port->portdev->vdev->dev,

				  devt, port, "vport%up%u",

				  port->portdev->drv_index, id);

				  port->portdev->vdev->index, id);

	if (IS_ERR(port->dev)) {

		err = PTR_ERR(port->dev);

		dev_err(&port->portdev->vdev->dev,
@@ -1442,7 +1436,7 @@ static int add_port(struct ports_device *portdev, u32 id) 
		 * rproc_serial does not want the console port, only

		 * the generic port implementation.

		 */

		port->host_connected = true;

		port->host_connected = port->guest_connected = true;

	else if (!use_multiport(port->portdev)) {

		/*

		 * If we're not using multiport support,
@@ -1470,7 +1464,7 @@ static int add_port(struct ports_device *portdev, u32 id) 
		 * inspect a port's state at any time

		 */

		sprintf(debugfs_name, "vport%up%u",

			port->portdev->drv_index, id);

			port->portdev->vdev->index, id);

		port->debugfs_file = debugfs_create_file(debugfs_name, 0444,

							 pdrvdata.debugfs_dir,

							 port,
@@ -1958,16 +1952,12 @@ static int virtcons_probe(struct virtio_device *vdev) 
	portdev->vdev = vdev;

	vdev->priv = portdev;



	spin_lock_irq(&pdrvdata_lock);

	portdev->drv_index = pdrvdata.index++;

	spin_unlock_irq(&pdrvdata_lock);



	portdev->chr_major = register_chrdev(0, "virtio-portsdev",

					     &portdev_fops);

	if (portdev->chr_major < 0) {

		dev_err(&vdev->dev,

			"Error %d registering chrdev for device %u\n",

			portdev->chr_major, portdev->drv_index);

			portdev->chr_major, vdev->index);

		err = portdev->chr_major;

		goto free;

	}

drivers/lguest/lguest_device.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static const char *lg_bus_name(struct virtio_device *vdev) 
}



/* The ops structure which hooks everything together. */

static struct virtio_config_ops lguest_config_ops = {

static const struct virtio_config_ops lguest_config_ops = {

	.get_features = lg_get_features,

	.finalize_features = lg_finalize_features,

	.get = lg_get,

drivers/net/virtio_net.c

+1 −11
Original line number Diff line number Diff line
@@ -1736,17 +1736,7 @@ static struct virtio_driver virtio_net_driver = { 
#endif

};



static int __init init(void)

{

	return register_virtio_driver(&virtio_net_driver);

}



static void __exit fini(void)

{

	unregister_virtio_driver(&virtio_net_driver);

}

module_init(init);

module_exit(fini);

module_virtio_driver(virtio_net_driver);



MODULE_DEVICE_TABLE(virtio, id_table);

MODULE_DESCRIPTION("Virtio network driver");

drivers/remoteproc/remoteproc_virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void rproc_virtio_finalize_features(struct virtio_device *vdev) 
	rvdev->gfeatures = vdev->features[0];

}



static struct virtio_config_ops rproc_virtio_config_ops = {

static const struct virtio_config_ops rproc_virtio_config_ops = {

	.get_features	= rproc_virtio_get_features,

	.finalize_features = rproc_virtio_finalize_features,

	.find_vqs	= rproc_virtio_find_vqs,

CRA Git | Maintained and supported by SUSTech CRA and CCSE