diff options
author | Ashutosh Dixit <ashutosh.dixit@intel.com> | 2013-10-29 20:09:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-30 13:19:30 -0400 |
commit | 425792266a40189e0b3fec02cb59a69935d8c58c (patch) | |
tree | 9e641e0cdff7856e7274ef54689a1a30f9ec1a6d /drivers/misc | |
parent | 86d6275a8f1b7ba64b79a46c7616264302f44410 (diff) |
misc: mic: Fixes for randconfig build errors and warnings.
This patch fixes the build errors and warnings reported at
https://lkml.org/lkml/2013/10/29/421.
Co-author: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Reviewed-by: Sudeep Dutt <sudeep.dutt@intel.com>
Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/mic/host/mic_boot.c | 1 | ||||
-rw-r--r-- | drivers/misc/mic/host/mic_fops.c | 1 | ||||
-rw-r--r-- | drivers/misc/mic/host/mic_virtio.c | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/misc/mic/host/mic_boot.c b/drivers/misc/mic/host/mic_boot.c index d56b8bf4eaf6..b079c65eed6d 100644 --- a/drivers/misc/mic/host/mic_boot.c +++ b/drivers/misc/mic/host/mic_boot.c | |||
@@ -20,6 +20,7 @@ | |||
20 | */ | 20 | */ |
21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
22 | #include <linux/firmware.h> | 22 | #include <linux/firmware.h> |
23 | #include <linux/pci.h> | ||
23 | 24 | ||
24 | #include <linux/mic_common.h> | 25 | #include <linux/mic_common.h> |
25 | #include "../common/mic_dev.h" | 26 | #include "../common/mic_dev.h" |
diff --git a/drivers/misc/mic/host/mic_fops.c b/drivers/misc/mic/host/mic_fops.c index 8dc6ff16845a..85776d7327f3 100644 --- a/drivers/misc/mic/host/mic_fops.c +++ b/drivers/misc/mic/host/mic_fops.c | |||
@@ -19,6 +19,7 @@ | |||
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | #include <linux/poll.h> | 21 | #include <linux/poll.h> |
22 | #include <linux/pci.h> | ||
22 | 23 | ||
23 | #include <linux/mic_common.h> | 24 | #include <linux/mic_common.h> |
24 | #include "../common/mic_dev.h" | 25 | #include "../common/mic_dev.h" |
diff --git a/drivers/misc/mic/host/mic_virtio.c b/drivers/misc/mic/host/mic_virtio.c index 0c883cd4f1d1..5b8494bd1e00 100644 --- a/drivers/misc/mic/host/mic_virtio.c +++ b/drivers/misc/mic/host/mic_virtio.c | |||
@@ -517,10 +517,10 @@ int mic_virtio_add_device(struct mic_vdev *mvdev, | |||
517 | void __user *argp) | 517 | void __user *argp) |
518 | { | 518 | { |
519 | struct mic_device *mdev = mvdev->mdev; | 519 | struct mic_device *mdev = mvdev->mdev; |
520 | struct mic_device_desc *dd; | 520 | struct mic_device_desc *dd = NULL; |
521 | struct mic_vqconfig *vqconfig; | 521 | struct mic_vqconfig *vqconfig; |
522 | int vr_size, i, j, ret; | 522 | int vr_size, i, j, ret; |
523 | u8 type; | 523 | u8 type = 0; |
524 | s8 db; | 524 | s8 db; |
525 | char irqname[10]; | 525 | char irqname[10]; |
526 | struct mic_bootparam *bootparam = mdev->dp; | 526 | struct mic_bootparam *bootparam = mdev->dp; |