net: vxget: clean up sparse warnings

[linux-2.6-microblaze.git] / drivers / virtio / virtio_balloon.c

diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 8be02f3..481611c 100644 (file)
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -128,7 +128,7 @@ struct virtio_balloon {
        struct page_reporting_dev_info pr_dev_info;
 };
 
-static struct virtio_device_id id_table[] = {
+static const struct virtio_device_id id_table[] = {
        { VIRTIO_ID_BALLOON, VIRTIO_DEV_ANY_ID },
        { 0 },
 };
@@ -398,12 +398,9 @@ static inline s64 towards_target(struct virtio_balloon *vb)
        s64 target;
        u32 num_pages;
 
-       virtio_cread(vb->vdev, struct virtio_balloon_config, num_pages,
-                    &num_pages);
-
        /* Legacy balloon config space is LE, unlike all other devices. */
-       if (!virtio_has_feature(vb->vdev, VIRTIO_F_VERSION_1))
-               num_pages = le32_to_cpu((__force __le32)num_pages);
+       virtio_cread_le(vb->vdev, struct virtio_balloon_config, num_pages,
+                       &num_pages);
 
        target = num_pages;
        return target - vb->num_pages;
@@ -462,11 +459,8 @@ static void update_balloon_size(struct virtio_balloon *vb)
        u32 actual = vb->num_pages;
 
        /* Legacy balloon config space is LE, unlike all other devices. */
-       if (!virtio_has_feature(vb->vdev, VIRTIO_F_VERSION_1))
-               actual = (__force u32)cpu_to_le32(actual);
-
-       virtio_cwrite(vb->vdev, struct virtio_balloon_config, actual,
-                     &actual);
+       virtio_cwrite_le(vb->vdev, struct virtio_balloon_config, actual,
+                        &actual);
 }
 
 static void update_balloon_stats_func(struct work_struct *work)
@@ -579,12 +573,10 @@ static u32 virtio_balloon_cmd_id_received(struct virtio_balloon *vb)
 {
        if (test_and_clear_bit(VIRTIO_BALLOON_CONFIG_READ_CMD_ID,
                               &vb->config_read_bitmap)) {
-               virtio_cread(vb->vdev, struct virtio_balloon_config,
-                            free_page_hint_cmd_id,
-                            &vb->cmd_id_received_cache);
                /* Legacy balloon config space is LE, unlike all other devices. */
-               if (!virtio_has_feature(vb->vdev, VIRTIO_F_VERSION_1))
-                       vb->cmd_id_received_cache = le32_to_cpu((__force __le32)vb->cmd_id_received_cache);
+               virtio_cread_le(vb->vdev, struct virtio_balloon_config,
+                               free_page_hint_cmd_id,
+                               &vb->cmd_id_received_cache);
        }
 
        return vb->cmd_id_received_cache;
@@ -600,7 +592,7 @@ static int send_cmd_id_start(struct virtio_balloon *vb)
        while (virtqueue_get_buf(vq, &unused))
                ;
 
-       vb->cmd_id_active = virtio32_to_cpu(vb->vdev,
+       vb->cmd_id_active = cpu_to_virtio32(vb->vdev,
                                        virtio_balloon_cmd_id_received(vb));
        sg_init_one(&sg, &vb->cmd_id_active, sizeof(vb->cmd_id_active));
        err = virtqueue_add_outbuf(vq, &sg, 1, &vb->cmd_id_active, GFP_KERNEL);
@@ -987,8 +979,8 @@ static int virtballoon_probe(struct virtio_device *vdev)
                if (!want_init_on_free())
                        memset(&poison_val, PAGE_POISON, sizeof(poison_val));
 
-               virtio_cwrite(vb->vdev, struct virtio_balloon_config,
-                             poison_val, &poison_val);
+               virtio_cwrite_le(vb->vdev, struct virtio_balloon_config,
+                                poison_val, &poison_val);
        }
 
        vb->pr_dev_info.report = virtballoon_free_page_report;
@@ -1129,7 +1121,7 @@ static int virtballoon_validate(struct virtio_device *vdev)
        else if (!virtio_has_feature(vdev, VIRTIO_BALLOON_F_PAGE_POISON))
                __virtio_clear_bit(vdev, VIRTIO_BALLOON_F_REPORTING);
 
-       __virtio_clear_bit(vdev, VIRTIO_F_IOMMU_PLATFORM);
+       __virtio_clear_bit(vdev, VIRTIO_F_ACCESS_PLATFORM);
        return 0;
 }