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

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: Sameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h
index 1365cb4a00f666d811778a54123a1fd21e6c1f4b..c7cb3fbde7b20f728b7f4af619ab473ba99863f1 100644 (file)
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -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;

diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c
index dcb10ac99b28f7707cc0d36a7a1367466478d7c1..2fd31c9762c6e4a204649a8db46bbff3c3856853 100644 (file)
--- a/drivers/staging/unisys/visorhba/visorhba_main.c
+++ b/drivers/staging/unisys/visorhba/visorhba_main.c
@@ -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)
@@ -1166,7 +1165,7 @@ static void visorhba_remove(struct visor_device *dev)
        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
  * is attached or removed.
  */

diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c
index 9b9af9e44fd647ad5863fa00719388d85518ecb6..2891622eef18d34837a6177bc578e067fc118cc0 100644 (file)
--- a/drivers/staging/unisys/visornic/visornic_main.c
+++ b/drivers/staging/unisys/visornic/visornic_main.c
@@ -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) {
@@ -2115,7 +2112,7 @@ static int visornic_resume(struct visor_device *dev,
        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
  * is attached or removed.
  */