aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2014-10-07 10:39:42 -0400
committerMichael S. Tsirkin <mst@redhat.com>2014-12-09 05:05:23 -0500
commite16e12be34648777606a2c03a3526409b38f0e63 (patch)
tree36298911ba8eed0a4805c2c30a56d92520d23432 /drivers/misc
parentd4024af56f7c6cdb7e721994204fb07b2cda8be9 (diff)
virtio: use u32, not bitmap for features
It seemed like a good idea to use bitmap for features in struct virtio_device, but it's actually a pain, and seems to become even more painful when we get more than 32 feature bits. Just change it to a u32 for now. Based on patch by Rusty. Suggested-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mic/card/mic_virtio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mic/card/mic_virtio.c b/drivers/misc/mic/card/mic_virtio.c
index e64794730e21..4f070ad1875c 100644
--- a/drivers/misc/mic/card/mic_virtio.c
+++ b/drivers/misc/mic/card/mic_virtio.c
@@ -101,7 +101,7 @@ static void mic_finalize_features(struct virtio_device *vdev)
101 bits = min_t(unsigned, feature_len, 101 bits = min_t(unsigned, feature_len,
102 sizeof(vdev->features)) * 8; 102 sizeof(vdev->features)) * 8;
103 for (i = 0; i < bits; i++) { 103 for (i = 0; i < bits; i++) {
104 if (test_bit(i, vdev->features)) 104 if (__virtio_test_bit(vdev, i))
105 iowrite8(ioread8(&out_features[i / 8]) | (1 << (i % 8)), 105 iowrite8(ioread8(&out_features[i / 8]) | (1 << (i % 8)),
106 &out_features[i / 8]); 106 &out_features[i / 8]);
107 } 107 }