From 9249c6a6d3560f09cddd04e2fda856f237b64987 Mon Sep 17 00:00:00 2001 From: Christian Gromm Date: Tue, 21 Nov 2017 15:04:38 +0100 Subject: [PATCH] staging: most: dim2: rename module This patch renames the folder and source files of the dim2 module. It is needed to clear the directory layout of the driver. Signed-off-by: Christian Gromm Signed-off-by: Greg Kroah-Hartman --- drivers/staging/most/Kconfig | 2 +- drivers/staging/most/{hdm-dim2 => dim2}/Kconfig | 6 +++--- drivers/staging/most/dim2/Makefile | 4 ++++ drivers/staging/most/{hdm-dim2/dim2_hdm.c => dim2/dim2.c} | 10 +++++----- drivers/staging/most/{hdm-dim2/dim2_hdm.h => dim2/dim2.h} | 2 +- drivers/staging/most/{hdm-dim2/dim2_errors.h => dim2/errors.h} | 2 +- drivers/staging/most/{hdm-dim2/dim2_hal.c => dim2/hal.c} | 8 ++++---- drivers/staging/most/{hdm-dim2/dim2_hal.h => dim2/hal.h} | 4 ++-- drivers/staging/most/{hdm-dim2/dim2_reg.h => dim2/reg.h} | 2 +- drivers/staging/most/{hdm-dim2/dim2_sysfs.c => dim2/sysfs.c} | 4 ++-- drivers/staging/most/{hdm-dim2/dim2_sysfs.h => dim2/sysfs.h} | 2 +- 11 files changed, 25 insertions(+), 21 deletions(-) rename drivers/staging/most/{hdm-dim2 => dim2}/Kconfig (83%) create mode 100644 drivers/staging/most/dim2/Makefile rename drivers/staging/most/{hdm-dim2/dim2_hdm.c => dim2/dim2.c} (99%) rename drivers/staging/most/{hdm-dim2/dim2_hdm.h => dim2/dim2.h} (91%) rename drivers/staging/most/{hdm-dim2/dim2_errors.h => dim2/errors.h} (94%) rename drivers/staging/most/{hdm-dim2/dim2_hal.c => dim2/hal.c} (99%) rename drivers/staging/most/{hdm-dim2/dim2_hal.h => dim2/hal.h} (97%) rename drivers/staging/most/{hdm-dim2/dim2_reg.h => dim2/reg.h} (98%) rename drivers/staging/most/{hdm-dim2/dim2_sysfs.c => dim2/sysfs.c} (97%) rename drivers/staging/most/{hdm-dim2/dim2_sysfs.h => dim2/sysfs.h} (93%) diff --git a/drivers/staging/most/Kconfig b/drivers/staging/most/Kconfig index b3393a5..88a415b 100644 --- a/drivers/staging/most/Kconfig +++ b/drivers/staging/most/Kconfig @@ -25,7 +25,7 @@ source "drivers/staging/most/aim-sound/Kconfig" source "drivers/staging/most/aim-v4l2/Kconfig" -source "drivers/staging/most/hdm-dim2/Kconfig" +source "drivers/staging/most/dim2/Kconfig" source "drivers/staging/most/i2c/Kconfig" diff --git a/drivers/staging/most/hdm-dim2/Kconfig b/drivers/staging/most/dim2/Kconfig similarity index 83% rename from drivers/staging/most/hdm-dim2/Kconfig rename to drivers/staging/most/dim2/Kconfig index 663bfeb..e39c4e5 100644 --- a/drivers/staging/most/hdm-dim2/Kconfig +++ b/drivers/staging/most/dim2/Kconfig @@ -2,8 +2,8 @@ # MediaLB configuration # -config HDM_DIM2 - tristate "DIM2 HDM" +config MOST_DIM2 + tristate "DIM2" depends on HAS_IOMEM ---help--- @@ -13,4 +13,4 @@ config HDM_DIM2 maintainer of this driver. To compile this driver as a module, choose M here: the - module will be called hdm_dim2. + module will be called most_dim2. diff --git a/drivers/staging/most/dim2/Makefile b/drivers/staging/most/dim2/Makefile new file mode 100644 index 0000000..66676f5 --- /dev/null +++ b/drivers/staging/most/dim2/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_MOST_DIM2) += most_dim2.o + +most_dim2-objs := dim2.o hal.o sysfs.o +ccflags-y += -Idrivers/staging/ diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.c b/drivers/staging/most/dim2/dim2.c similarity index 99% rename from drivers/staging/most/hdm-dim2/dim2_hdm.c rename to drivers/staging/most/dim2/dim2.c index fedd2d0..921db98 100644 --- a/drivers/staging/most/hdm-dim2/dim2_hdm.c +++ b/drivers/staging/most/dim2/dim2.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_hdm.c - MediaLB DIM2 Hardware Dependent Module + * dim2.c - MediaLB DIM2 Hardware Dependent Module * * Copyright (C) 2015-2016, Microchip Technology Germany II GmbH & Co. KG */ @@ -20,10 +20,10 @@ #include #include "most/core.h" -#include "dim2_hal.h" -#include "dim2_hdm.h" -#include "dim2_errors.h" -#include "dim2_sysfs.h" +#include "hal.h" +#include "dim2.h" +#include "errors.h" +#include "sysfs.h" #define DMA_CHANNELS (32 - 1) /* channel 0 is a system channel */ diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.h b/drivers/staging/most/dim2/dim2.h similarity index 91% rename from drivers/staging/most/hdm-dim2/dim2_hdm.h rename to drivers/staging/most/dim2/dim2.h index 5f380b6..6a9fc51 100644 --- a/drivers/staging/most/hdm-dim2/dim2_hdm.h +++ b/drivers/staging/most/dim2/dim2.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_hdm.h - MediaLB DIM2 HDM Header + * dim2.h - MediaLB DIM2 HDM Header * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG */ diff --git a/drivers/staging/most/hdm-dim2/dim2_errors.h b/drivers/staging/most/dim2/errors.h similarity index 94% rename from drivers/staging/most/hdm-dim2/dim2_errors.h rename to drivers/staging/most/dim2/errors.h index 8b90196..3487510 100644 --- a/drivers/staging/most/hdm-dim2/dim2_errors.h +++ b/drivers/staging/most/dim2/errors.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_errors.h - Definitions of errors for DIM2 HAL API + * errors.h - Definitions of errors for DIM2 HAL API * (MediaLB, Device Interface Macro IP, OS62420) * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.c b/drivers/staging/most/dim2/hal.c similarity index 99% rename from drivers/staging/most/hdm-dim2/dim2_hal.c rename to drivers/staging/most/dim2/hal.c index f98ac93..17c04e1 100644 --- a/drivers/staging/most/hdm-dim2/dim2_hal.c +++ b/drivers/staging/most/dim2/hal.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_hal.c - DIM2 HAL implementation + * hal.c - DIM2 HAL implementation * (MediaLB, Device Interface Macro IP, OS62420) * * Copyright (C) 2015-2016, Microchip Technology Germany II GmbH & Co. KG @@ -8,9 +8,9 @@ /* Author: Andrey Shvetsov */ -#include "dim2_hal.h" -#include "dim2_errors.h" -#include "dim2_reg.h" +#include "hal.h" +#include "errors.h" +#include "reg.h" #include #include diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.h b/drivers/staging/most/dim2/hal.h similarity index 97% rename from drivers/staging/most/hdm-dim2/dim2_hal.h rename to drivers/staging/most/dim2/hal.h index fce9ae9..e04a535 100644 --- a/drivers/staging/most/hdm-dim2/dim2_hal.h +++ b/drivers/staging/most/dim2/hal.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_hal.h - DIM2 HAL interface + * hal.h - DIM2 HAL interface * (MediaLB, Device Interface Macro IP, OS62420) * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG @@ -10,7 +10,7 @@ #define _DIM2_HAL_H #include -#include "dim2_reg.h" +#include "reg.h" /* * The values below are specified in the hardware specification. diff --git a/drivers/staging/most/hdm-dim2/dim2_reg.h b/drivers/staging/most/dim2/reg.h similarity index 98% rename from drivers/staging/most/hdm-dim2/dim2_reg.h rename to drivers/staging/most/dim2/reg.h index 2b2fca4..69cbf78 100644 --- a/drivers/staging/most/hdm-dim2/dim2_reg.h +++ b/drivers/staging/most/dim2/reg.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_reg.h - Definitions for registers of DIM2 + * reg.h - Definitions for registers of DIM2 * (MediaLB, Device Interface Macro IP, OS62420) * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG diff --git a/drivers/staging/most/hdm-dim2/dim2_sysfs.c b/drivers/staging/most/dim2/sysfs.c similarity index 97% rename from drivers/staging/most/hdm-dim2/dim2_sysfs.c rename to drivers/staging/most/dim2/sysfs.c index 3a2ad35..ec1f4ce 100644 --- a/drivers/staging/most/hdm-dim2/dim2_sysfs.c +++ b/drivers/staging/most/dim2/sysfs.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_sysfs.c - MediaLB sysfs information + * sysfs.c - MediaLB sysfs information * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG */ @@ -10,7 +10,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include -#include "dim2_sysfs.h" +#include "sysfs.h" struct bus_attr { struct attribute attr; diff --git a/drivers/staging/most/hdm-dim2/dim2_sysfs.h b/drivers/staging/most/dim2/sysfs.h similarity index 93% rename from drivers/staging/most/hdm-dim2/dim2_sysfs.h rename to drivers/staging/most/dim2/sysfs.h index e46dc4b..a33ebd8 100644 --- a/drivers/staging/most/hdm-dim2/dim2_sysfs.h +++ b/drivers/staging/most/dim2/sysfs.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * dim2_sysfs.h - MediaLB sysfs information + * sysfs.h - MediaLB sysfs information * * Copyright (C) 2015, Microchip Technology Germany II GmbH & Co. KG */ -- 2.7.4