1 files changed, 9 insertions, 14 deletions

diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index bda52f18e967..1dbee95838fe 100644
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -701,7 +701,6 @@ static void virtio_ccw_finalize_features(struct virtio_device *vdev)
 {
         struct virtio_ccw_device *vcdev = to_vc_device(vdev);
         struct virtio_feature_desc *features;
-        int i;
         struct ccw1 *ccw;
 
         ccw = kzalloc(sizeof(*ccw), GFP_DMA | GFP_KERNEL);
@@ -715,19 +714,15 @@ static void virtio_ccw_finalize_features(struct virtio_device *vdev)
         /* Give virtio_ring a chance to accept features. */
         vring_transport_features(vdev);
 
-        for (i = 0; i < sizeof(*vdev->features) / sizeof(features->features);
-             i++) {
-                int highbits = i % 2 ? 32 : 0;
-                features->index = i;
-                features->features = cpu_to_le32(vdev->features[i / 2]
-                                                 >> highbits);
-                /* Write the feature bits to the host. */
-                ccw->cmd_code = CCW_CMD_WRITE_FEAT;
-                ccw->flags = 0;
-                ccw->count = sizeof(*features);
-                ccw->cda = (__u32)(unsigned long)features;
-                ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_WRITE_FEAT);
-        }
+        features->index = 0;
+        features->features = cpu_to_le32(vdev->features);
+        /* Write the feature bits to the host. */
+        ccw->cmd_code = CCW_CMD_WRITE_FEAT;
+        ccw->flags = 0;
+        ccw->count = sizeof(*features);
+        ccw->cda = (__u32)(unsigned long)features;
+        ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_WRITE_FEAT);
+
 out_free:
         kfree(features);
         kfree(ccw);