Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 172f4c36 authored by Sameer Wadgaonkar's avatar Sameer Wadgaonkar Committed by Greg Kroah-Hartman
Browse files

staging: unisys: include: renamed structure spar_io_channel_protocol in... 


staging: unisys: include: renamed structure spar_io_channel_protocol in iochannel.h to match driver namespace

Renamed structure spar_io_channel_protocol to visor_io_channel and
changed "visor bus" to "visorbus" in a comment in visornic_main.c
and visorhba_main.c.

Signed-off-by: default avatarSameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68646323

drivers/staging/unisys/include/iochannel.h

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ struct iochannel_vnic { 
 * this header there is a large region of memory which contains the command and

 * response queues as specified in cmd_q and rsp_q SIGNAL_QUEUE_HEADERS.

 */

struct spar_io_channel_protocol {

struct visor_io_channel {

	struct channel_header channel_header;

	struct signal_queue_header cmd_q;

	struct signal_queue_header rsp_q;

drivers/staging/unisys/visorhba/visorhba_main.c

+3 −4
Original line number Diff line number Diff line
@@ -1060,8 +1060,7 @@ static int visorhba_probe(struct visor_device *dev) 
	if (!scsihost)

		return -ENODEV;



	channel_offset = offsetof(struct spar_io_channel_protocol,

				  vhba.max);

	channel_offset = offsetof(struct visor_io_channel, vhba.max);

	err = visorbus_read_channel(dev, channel_offset, &max,

				    sizeof(struct vhba_config_max));

	if (err < 0)
@@ -1105,7 +1104,7 @@ static int visorhba_probe(struct visor_device *dev) 
	devdata->serverchangingstate = false;

	devdata->scsihost = scsihost;



	channel_offset = offsetof(struct spar_io_channel_protocol,

	channel_offset = offsetof(struct visor_io_channel,

				  channel_header.features);

	err = visorbus_read_channel(dev, channel_offset, &features, 8);

	if (err)

drivers/staging/unisys/visornic/visornic_main.c

+5 −8
Original line number Diff line number Diff line
@@ -1807,8 +1807,7 @@ static int visornic_probe(struct visor_device *dev) 


	/* Get MAC address from channel and read it into the device. */

	netdev->addr_len = ETH_ALEN;

	channel_offset = offsetof(struct spar_io_channel_protocol,

				  vnic.macaddr);

	channel_offset = offsetof(struct visor_io_channel, vnic.macaddr);

	err = visorbus_read_channel(dev, channel_offset, netdev->dev_addr,

				    ETH_ALEN);

	if (err < 0) {
@@ -1836,8 +1835,7 @@ static int visornic_probe(struct visor_device *dev) 
	atomic_set(&devdata->usage, 1);



	/* Setup rcv bufs */

	channel_offset = offsetof(struct spar_io_channel_protocol,

				  vnic.num_rcv_bufs);

	channel_offset = offsetof(struct visor_io_channel, vnic.num_rcv_bufs);

	err = visorbus_read_channel(dev, channel_offset,

				    &devdata->num_rcv_bufs, 4);

	if (err) {
@@ -1884,8 +1882,7 @@ static int visornic_probe(struct visor_device *dev) 
	devdata->server_change_state = false;



	/*set the default mtu */

	channel_offset = offsetof(struct spar_io_channel_protocol,

				  vnic.mtu);

	channel_offset = offsetof(struct visor_io_channel, vnic.mtu);

	err = visorbus_read_channel(dev, channel_offset, &netdev->mtu, 4);

	if (err) {

		dev_err(&dev->device,
@@ -1906,7 +1903,7 @@ static int visornic_probe(struct visor_device *dev) 
	 */

	mod_timer(&devdata->irq_poll_timer, msecs_to_jiffies(2));



	channel_offset = offsetof(struct spar_io_channel_protocol,

	channel_offset = offsetof(struct visor_io_channel,

				  channel_header.features);

	err = visorbus_read_channel(dev, channel_offset, &features, 8);

	if (err) {