tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

misc: mic: header file cleanups.

Dont use same name for header files in different folders.

These changes were suggested by Greg Kroah-Hartman during the
code review @ https://lkml.org/lkml/2013/9/6/18

Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
Signed-off-by: Harshavardhan R Kharche <harshavardhan.r.kharche@intel.com>
Signed-off-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Sudeep Dutt and committed by
Greg Kroah-Hartman 4aa79961 2ce58528

+15 -15
+1 -1
drivers/misc/mic/card/mic_debugfs.c
··· 30 30 #include <linux/interrupt.h> 31 31 #include <linux/device.h> 32 32 33 - #include "../common/mic_device.h" 33 + #include "../common/mic_dev.h" 34 34 #include "mic_device.h" 35 35 36 36 /* Debugfs parent dir */
+1 -1
drivers/misc/mic/card/mic_device.c
··· 30 30 #include <linux/reboot.h> 31 31 32 32 #include <linux/mic_common.h> 33 - #include "../common/mic_device.h" 33 + #include "../common/mic_dev.h" 34 34 #include "mic_device.h" 35 35 #include "mic_virtio.h" 36 36
+1 -1
drivers/misc/mic/card/mic_virtio.c
··· 40 40 #include <linux/slab.h> 41 41 #include <linux/virtio_config.h> 42 42 43 - #include "../common/mic_device.h" 43 + #include "../common/mic_dev.h" 44 44 #include "mic_virtio.h" 45 45 46 46 #define VIRTIO_SUBCODE_64 0x0D00
+1 -1
drivers/misc/mic/card/mic_x100.c
··· 28 28 #include <linux/pci.h> 29 29 #include <linux/platform_device.h> 30 30 31 - #include "../common/mic_device.h" 31 + #include "../common/mic_dev.h" 32 32 #include "mic_device.h" 33 33 #include "mic_x100.h" 34 34
+2 -2
drivers/misc/mic/common/mic_device.h drivers/misc/mic/common/mic_dev.h
··· 18 18 * Intel MIC driver. 19 19 * 20 20 */ 21 - #ifndef __MIC_COMMON_DEVICE_H_ 22 - #define __MIC_COMMON_DEVICE_H_ 21 + #ifndef __MIC_DEV_H__ 22 + #define __MIC_DEV_H__ 23 23 24 24 /** 25 25 * struct mic_mw - MIC memory window
+1 -1
drivers/misc/mic/host/mic_boot.c
··· 22 22 #include <linux/firmware.h> 23 23 24 24 #include <linux/mic_common.h> 25 - #include "../common/mic_device.h" 25 + #include "../common/mic_dev.h" 26 26 #include "mic_device.h" 27 27 #include "mic_smpt.h" 28 28 #include "mic_virtio.h"
+1 -1
drivers/misc/mic/host/mic_debugfs.c
··· 23 23 #include <linux/seq_file.h> 24 24 25 25 #include <linux/mic_common.h> 26 - #include "../common/mic_device.h" 26 + #include "../common/mic_dev.h" 27 27 #include "mic_device.h" 28 28 #include "mic_smpt.h" 29 29 #include "mic_virtio.h"
+1 -1
drivers/misc/mic/host/mic_fops.c
··· 21 21 #include <linux/poll.h> 22 22 23 23 #include <linux/mic_common.h> 24 - #include "../common/mic_device.h" 24 + #include "../common/mic_dev.h" 25 25 #include "mic_device.h" 26 26 #include "mic_fops.h" 27 27 #include "mic_virtio.h"
+1 -1
drivers/misc/mic/host/mic_intr.c
··· 21 21 #include <linux/pci.h> 22 22 #include <linux/interrupt.h> 23 23 24 - #include "../common/mic_device.h" 24 + #include "../common/mic_dev.h" 25 25 #include "mic_device.h" 26 26 27 27 /*
+1 -1
drivers/misc/mic/host/mic_main.c
··· 28 28 #include <linux/poll.h> 29 29 30 30 #include <linux/mic_common.h> 31 - #include "../common/mic_device.h" 31 + #include "../common/mic_dev.h" 32 32 #include "mic_device.h" 33 33 #include "mic_x100.h" 34 34 #include "mic_smpt.h"
+1 -1
drivers/misc/mic/host/mic_smpt.c
··· 20 20 */ 21 21 #include <linux/pci.h> 22 22 23 - #include "../common/mic_device.h" 23 + #include "../common/mic_dev.h" 24 24 #include "mic_device.h" 25 25 #include "mic_smpt.h" 26 26
+1 -1
drivers/misc/mic/host/mic_sysfs.c
··· 21 21 #include <linux/pci.h> 22 22 23 23 #include <linux/mic_common.h> 24 - #include "../common/mic_device.h" 24 + #include "../common/mic_dev.h" 25 25 #include "mic_device.h" 26 26 27 27 /*
+1 -1
drivers/misc/mic/host/mic_virtio.c
··· 23 23 #include <linux/uaccess.h> 24 24 25 25 #include <linux/mic_common.h> 26 - #include "../common/mic_device.h" 26 + #include "../common/mic_dev.h" 27 27 #include "mic_device.h" 28 28 #include "mic_smpt.h" 29 29 #include "mic_virtio.h"
+1 -1
drivers/misc/mic/host/mic_x100.c
··· 24 24 #include <linux/firmware.h> 25 25 #include <linux/delay.h> 26 26 27 - #include "../common/mic_device.h" 27 + #include "../common/mic_dev.h" 28 28 #include "mic_device.h" 29 29 #include "mic_x100.h" 30 30 #include "mic_smpt.h"