From 4aa79961a50119d6112a160e97d5e6a77656b68c Mon Sep 17 00:00:00 2001 From: Sudeep Dutt Date: Fri, 27 Sep 2013 09:49:42 -0700 Subject: 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 Signed-off-by: Ashutosh Dixit Signed-off-by: Dasaratharaman Chandramouli Signed-off-by: Nikhil Rao Signed-off-by: Harshavardhan R Kharche Signed-off-by: Sudeep Dutt Signed-off-by: Greg Kroah-Hartman --- drivers/misc/mic/card/mic_debugfs.c | 2 +- drivers/misc/mic/card/mic_device.c | 2 +- drivers/misc/mic/card/mic_virtio.c | 2 +- drivers/misc/mic/card/mic_x100.c | 2 +- drivers/misc/mic/common/mic_dev.h | 51 ++++++++++++++++++++++++++++++++++++ drivers/misc/mic/common/mic_device.h | 51 ------------------------------------ drivers/misc/mic/host/mic_boot.c | 2 +- drivers/misc/mic/host/mic_debugfs.c | 2 +- drivers/misc/mic/host/mic_fops.c | 2 +- drivers/misc/mic/host/mic_intr.c | 2 +- drivers/misc/mic/host/mic_main.c | 2 +- drivers/misc/mic/host/mic_smpt.c | 2 +- drivers/misc/mic/host/mic_sysfs.c | 2 +- drivers/misc/mic/host/mic_virtio.c | 2 +- drivers/misc/mic/host/mic_x100.c | 2 +- 15 files changed, 64 insertions(+), 64 deletions(-) create mode 100644 drivers/misc/mic/common/mic_dev.h delete mode 100644 drivers/misc/mic/common/mic_device.h (limited to 'drivers/misc') diff --git a/drivers/misc/mic/card/mic_debugfs.c b/drivers/misc/mic/card/mic_debugfs.c index 95cf186ff73a..421b3d7911df 100644 --- a/drivers/misc/mic/card/mic_debugfs.c +++ b/drivers/misc/mic/card/mic_debugfs.c @@ -30,7 +30,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" /* Debugfs parent dir */ diff --git a/drivers/misc/mic/card/mic_device.c b/drivers/misc/mic/card/mic_device.c index 4125217579af..175d11425636 100644 --- a/drivers/misc/mic/card/mic_device.c +++ b/drivers/misc/mic/card/mic_device.c @@ -30,7 +30,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" #include "mic_virtio.h" diff --git a/drivers/misc/mic/card/mic_virtio.c b/drivers/misc/mic/card/mic_virtio.c index 38275c1b9e03..7420c33d8f65 100644 --- a/drivers/misc/mic/card/mic_virtio.c +++ b/drivers/misc/mic/card/mic_virtio.c @@ -40,7 +40,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_virtio.h" #define VIRTIO_SUBCODE_64 0x0D00 diff --git a/drivers/misc/mic/card/mic_x100.c b/drivers/misc/mic/card/mic_x100.c index 7cb3469cf684..f491c9163bb2 100644 --- a/drivers/misc/mic/card/mic_x100.c +++ b/drivers/misc/mic/card/mic_x100.c @@ -28,7 +28,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" #include "mic_x100.h" diff --git a/drivers/misc/mic/common/mic_dev.h b/drivers/misc/mic/common/mic_dev.h new file mode 100644 index 000000000000..92999c2bbf82 --- /dev/null +++ b/drivers/misc/mic/common/mic_dev.h @@ -0,0 +1,51 @@ +/* + * Intel MIC Platform Software Stack (MPSS) + * + * Copyright(c) 2013 Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * The full GNU General Public License is included in this distribution in + * the file called "COPYING". + * + * Intel MIC driver. + * + */ +#ifndef __MIC_DEV_H__ +#define __MIC_DEV_H__ + +/** + * struct mic_mw - MIC memory window + * + * @pa: Base physical address. + * @va: Base ioremap'd virtual address. + * @len: Size of the memory window. + */ +struct mic_mw { + phys_addr_t pa; + void __iomem *va; + resource_size_t len; +}; + +/* + * Scratch pad register offsets used by the host to communicate + * device page DMA address to the card. + */ +#define MIC_DPLO_SPAD 14 +#define MIC_DPHI_SPAD 15 + +/* + * These values are supposed to be in the config_change field of the + * device page when the host sends a config change interrupt to the card. + */ +#define MIC_VIRTIO_PARAM_DEV_REMOVE 0x1 +#define MIC_VIRTIO_PARAM_CONFIG_CHANGED 0x2 + +#endif diff --git a/drivers/misc/mic/common/mic_device.h b/drivers/misc/mic/common/mic_device.h deleted file mode 100644 index 01eb74faae6b..000000000000 --- a/drivers/misc/mic/common/mic_device.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Intel MIC Platform Software Stack (MPSS) - * - * Copyright(c) 2013 Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * The full GNU General Public License is included in this distribution in - * the file called "COPYING". - * - * Intel MIC driver. - * - */ -#ifndef __MIC_COMMON_DEVICE_H_ -#define __MIC_COMMON_DEVICE_H_ - -/** - * struct mic_mw - MIC memory window - * - * @pa: Base physical address. - * @va: Base ioremap'd virtual address. - * @len: Size of the memory window. - */ -struct mic_mw { - phys_addr_t pa; - void __iomem *va; - resource_size_t len; -}; - -/* - * Scratch pad register offsets used by the host to communicate - * device page DMA address to the card. - */ -#define MIC_DPLO_SPAD 14 -#define MIC_DPHI_SPAD 15 - -/* - * These values are supposed to be in the config_change field of the - * device page when the host sends a config change interrupt to the card. - */ -#define MIC_VIRTIO_PARAM_DEV_REMOVE 0x1 -#define MIC_VIRTIO_PARAM_CONFIG_CHANGED 0x2 - -#endif diff --git a/drivers/misc/mic/host/mic_boot.c b/drivers/misc/mic/host/mic_boot.c index fd9ff6d3784e..60c54d5c43c2 100644 --- a/drivers/misc/mic/host/mic_boot.c +++ b/drivers/misc/mic/host/mic_boot.c @@ -22,7 +22,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" #include "mic_smpt.h" #include "mic_virtio.h" diff --git a/drivers/misc/mic/host/mic_debugfs.c b/drivers/misc/mic/host/mic_debugfs.c index e22fb7bbbb98..98a61b4319f4 100644 --- a/drivers/misc/mic/host/mic_debugfs.c +++ b/drivers/misc/mic/host/mic_debugfs.c @@ -23,7 +23,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" #include "mic_smpt.h" #include "mic_virtio.h" diff --git a/drivers/misc/mic/host/mic_fops.c b/drivers/misc/mic/host/mic_fops.c index 661469ad339d..e699c80a8c0a 100644 --- a/drivers/misc/mic/host/mic_fops.c +++ b/drivers/misc/mic/host/mic_fops.c @@ -21,7 +21,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" #include "mic_fops.h" #include "mic_virtio.h" diff --git a/drivers/misc/mic/host/mic_intr.c b/drivers/misc/mic/host/mic_intr.c index cdae3141dbb9..71a7521cf1a4 100644 --- a/drivers/misc/mic/host/mic_intr.c +++ b/drivers/misc/mic/host/mic_intr.c @@ -21,7 +21,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" /* diff --git a/drivers/misc/mic/host/mic_main.c b/drivers/misc/mic/host/mic_main.c index a8965d496e84..ca06aa9b7114 100644 --- a/drivers/misc/mic/host/mic_main.c +++ b/drivers/misc/mic/host/mic_main.c @@ -28,7 +28,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" #include "mic_x100.h" #include "mic_smpt.h" diff --git a/drivers/misc/mic/host/mic_smpt.c b/drivers/misc/mic/host/mic_smpt.c index a3462076bc57..003d02b212be 100644 --- a/drivers/misc/mic/host/mic_smpt.c +++ b/drivers/misc/mic/host/mic_smpt.c @@ -20,7 +20,7 @@ */ #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" #include "mic_smpt.h" diff --git a/drivers/misc/mic/host/mic_sysfs.c b/drivers/misc/mic/host/mic_sysfs.c index bebbae2fa9f8..029a4f31bee7 100644 --- a/drivers/misc/mic/host/mic_sysfs.c +++ b/drivers/misc/mic/host/mic_sysfs.c @@ -21,7 +21,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" /* diff --git a/drivers/misc/mic/host/mic_virtio.c b/drivers/misc/mic/host/mic_virtio.c index be2a1f06c4ca..9e0456fb1ea8 100644 --- a/drivers/misc/mic/host/mic_virtio.c +++ b/drivers/misc/mic/host/mic_virtio.c @@ -23,7 +23,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" #include "mic_smpt.h" #include "mic_virtio.h" diff --git a/drivers/misc/mic/host/mic_x100.c b/drivers/misc/mic/host/mic_x100.c index a12ae5c8844d..3a0d660bad4a 100644 --- a/drivers/misc/mic/host/mic_x100.c +++ b/drivers/misc/mic/host/mic_x100.c @@ -24,7 +24,7 @@ #include #include -#include "../common/mic_device.h" +#include "../common/mic_dev.h" #include "mic_device.h" #include "mic_x100.h" #include "mic_smpt.h" -- cgit v1.2.3