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

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
...@@ -529,7 +529,7 @@ struct iochannel_vnic { ...@@ -529,7 +529,7 @@ struct iochannel_vnic {
* this header there is a large region of memory which contains the command and * 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. * 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 channel_header channel_header;
struct signal_queue_header cmd_q; struct signal_queue_header cmd_q;
struct signal_queue_header rsp_q; struct signal_queue_header rsp_q;
......
...@@ -1060,8 +1060,7 @@ static int visorhba_probe(struct visor_device *dev) ...@@ -1060,8 +1060,7 @@ static int visorhba_probe(struct visor_device *dev)
if (!scsihost) if (!scsihost)
return -ENODEV; return -ENODEV;
channel_offset = offsetof(struct spar_io_channel_protocol, channel_offset = offsetof(struct visor_io_channel, vhba.max);
vhba.max);
err = visorbus_read_channel(dev, channel_offset, &max, err = visorbus_read_channel(dev, channel_offset, &max,
sizeof(struct vhba_config_max)); sizeof(struct vhba_config_max));
if (err < 0) if (err < 0)
...@@ -1105,7 +1104,7 @@ static int visorhba_probe(struct visor_device *dev) ...@@ -1105,7 +1104,7 @@ static int visorhba_probe(struct visor_device *dev)
devdata->serverchangingstate = false; devdata->serverchangingstate = false;
devdata->scsihost = scsihost; devdata->scsihost = scsihost;
channel_offset = offsetof(struct spar_io_channel_protocol, channel_offset = offsetof(struct visor_io_channel,
channel_header.features); channel_header.features);
err = visorbus_read_channel(dev, channel_offset, &features, 8); err = visorbus_read_channel(dev, channel_offset, &features, 8);
if (err) if (err)
...@@ -1166,7 +1165,7 @@ static void visorhba_remove(struct visor_device *dev) ...@@ -1166,7 +1165,7 @@ static void visorhba_remove(struct visor_device *dev)
debugfs_remove_recursive(devdata->debugfs_dir); debugfs_remove_recursive(devdata->debugfs_dir);
} }
/* This is used to tell the visor bus driver which types of visor devices /* This is used to tell the visorbus driver which types of visor devices
* we support, and what functions to call when a visor device that we support * we support, and what functions to call when a visor device that we support
* is attached or removed. * is attached or removed.
*/ */
......
...@@ -1807,8 +1807,7 @@ static int visornic_probe(struct visor_device *dev) ...@@ -1807,8 +1807,7 @@ static int visornic_probe(struct visor_device *dev)
/* Get MAC address from channel and read it into the device. */ /* Get MAC address from channel and read it into the device. */
netdev->addr_len = ETH_ALEN; netdev->addr_len = ETH_ALEN;
channel_offset = offsetof(struct spar_io_channel_protocol, channel_offset = offsetof(struct visor_io_channel, vnic.macaddr);
vnic.macaddr);
err = visorbus_read_channel(dev, channel_offset, netdev->dev_addr, err = visorbus_read_channel(dev, channel_offset, netdev->dev_addr,
ETH_ALEN); ETH_ALEN);
if (err < 0) { if (err < 0) {
...@@ -1836,8 +1835,7 @@ static int visornic_probe(struct visor_device *dev) ...@@ -1836,8 +1835,7 @@ static int visornic_probe(struct visor_device *dev)
atomic_set(&devdata->usage, 1); atomic_set(&devdata->usage, 1);
/* Setup rcv bufs */ /* Setup rcv bufs */
channel_offset = offsetof(struct spar_io_channel_protocol, channel_offset = offsetof(struct visor_io_channel, vnic.num_rcv_bufs);
vnic.num_rcv_bufs);
err = visorbus_read_channel(dev, channel_offset, err = visorbus_read_channel(dev, channel_offset,
&devdata->num_rcv_bufs, 4); &devdata->num_rcv_bufs, 4);
if (err) { if (err) {
...@@ -1884,8 +1882,7 @@ static int visornic_probe(struct visor_device *dev) ...@@ -1884,8 +1882,7 @@ static int visornic_probe(struct visor_device *dev)
devdata->server_change_state = false; devdata->server_change_state = false;
/*set the default mtu */ /*set the default mtu */
channel_offset = offsetof(struct spar_io_channel_protocol, channel_offset = offsetof(struct visor_io_channel, vnic.mtu);
vnic.mtu);
err = visorbus_read_channel(dev, channel_offset, &netdev->mtu, 4); err = visorbus_read_channel(dev, channel_offset, &netdev->mtu, 4);
if (err) { if (err) {
dev_err(&dev->device, dev_err(&dev->device,
...@@ -1906,7 +1903,7 @@ static int visornic_probe(struct visor_device *dev) ...@@ -1906,7 +1903,7 @@ static int visornic_probe(struct visor_device *dev)
*/ */
mod_timer(&devdata->irq_poll_timer, msecs_to_jiffies(2)); 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); channel_header.features);
err = visorbus_read_channel(dev, channel_offset, &features, 8); err = visorbus_read_channel(dev, channel_offset, &features, 8);
if (err) { if (err) {
...@@ -2115,7 +2112,7 @@ static int visornic_resume(struct visor_device *dev, ...@@ -2115,7 +2112,7 @@ static int visornic_resume(struct visor_device *dev,
return 0; return 0;
} }
/* This is used to tell the visor bus driver which types of visor devices /* This is used to tell the visorbus driver which types of visor devices
* we support, and what functions to call when a visor device that we support * we support, and what functions to call when a visor device that we support
* is attached or removed. * is attached or removed.
*/ */
......
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