From: root <root@huangds-desktop.(none)>
Date: Wed, 26 Jan 2011 09:38:08 +0000 (+0800)
Subject: modify filename
X-Git-Tag: firefly_0821_release~10789^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=18d7f246ae28b01881899d6d02ce157ed3f63f2b;p=firefly-linux-kernel-4.4.55.git
modify filename
---
diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 9208746b8f9a..7d71dbb9f9eb 100755
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -229,7 +229,7 @@ struct platform_device rk29_device_fb = {
}
};
-struct platform_device rk29_device_Dma_cpy = {
+struct platform_device rk29_device_dma_cpy = {
.name = "dma_memcpy",
.id = 4,
@@ -1443,7 +1443,7 @@ static struct platform_device *devices[] __initdata = {
#ifdef CONFIG_FB_RK29
&rk29_device_fb,
- &rk29_device_Dma_cpy,
+ &rk29_device_dma_cpy,
#endif
#ifdef CONFIG_BACKLIGHT_RK29_BL
&rk29_device_backlight,
diff --git a/arch/arm/mach-rk29/devices.h b/arch/arm/mach-rk29/devices.h
index b8637fb5c1f3..b6e2c8033524 100755
--- a/arch/arm/mach-rk29/devices.h
+++ b/arch/arm/mach-rk29/devices.h
@@ -40,7 +40,7 @@ extern struct platform_device rk29xx_device_spi1m;
extern struct rk29xx_spi_platform_data rk29xx_spi0_platdata;
extern struct rk29xx_spi_platform_data rk29xx_spi1_platdata;
extern struct platform_device rk29_device_fb;
-extern struct platform_device rk29_device_Dma_cpy;
+extern struct platform_device rk29_device_dma_cpy;
extern struct platform_device rk29_device_nand;
extern struct platform_device rk29xx_device_nand;
extern struct rk29_sdmmc_platform_data default_sdmmc0_data;
diff --git a/arch/arm/mach-rk29/dma.c b/arch/arm/mach-rk29/dma.c
index 35c0e77467b0..5799662ca1df 100755
--- a/arch/arm/mach-rk29/dma.c
+++ b/arch/arm/mach-rk29/dma.c
@@ -30,7 +30,7 @@ static struct rk29_pl330_platdata rk29_dmac0_pdata = {
[4] = DMACH_I2S_2CH_TX,
[5] = DMACH_I2S_2CH_RX,
[6] = DMACH_SPDIF,
- [7] = DMACH_DMAC0_MemToMem,
+ [7] = DMACH_DMAC0_MEMTOMEM,
[8] = DMACH_MAX,
[9] = DMACH_MAX,
[10] = DMACH_MAX,
diff --git a/arch/arm/mach-rk29/include/mach/rk29-dma-pl330.h b/arch/arm/mach-rk29/include/mach/rk29-dma-pl330.h
index 8443d554335b..1b5dae882d49 100755
--- a/arch/arm/mach-rk29/include/mach/rk29-dma-pl330.h
+++ b/arch/arm/mach-rk29/include/mach/rk29-dma-pl330.h
@@ -46,7 +46,7 @@ enum dma_ch {
DMACH_SPI1_TX,
DMACH_SPI1_RX,
DMACH_PID_FILTER,
- DMACH_DMAC0_MemToMem,
+ DMACH_DMAC0_MEMTOMEM,
/* END Marker, also used to denote a reserved channel */
DMACH_MAX,
};
diff --git a/arch/arm/mach-rk29/memcpy_dma.c b/arch/arm/mach-rk29/memcpy_dma.c
index 6cd496b6dd60..da17f9018256 100755
--- a/arch/arm/mach-rk29/memcpy_dma.c
+++ b/arch/arm/mach-rk29/memcpy_dma.c
@@ -15,7 +15,7 @@
static DECLARE_WAIT_QUEUE_HEAD(wq);
static int wq_condition = 0;
-static struct rk29_dma_client rk29_dma_Memcpy_client = {
+static struct rk29_dma_client rk29_dma_memcpy_client = {
.name = "rk29-dma-memcpy",
};
@@ -34,13 +34,13 @@ static void rk29_dma_memcpy_callback(struct rk29_dma_chan *dma_ch, void *buf_id,
}
//int slecount = 0;
-static ssize_t Memcpy_Dma_read(struct device *device,struct device_attribute *attr, void *argv)
+static ssize_t memcpy_dma_read(struct device *device,struct device_attribute *attr, void *argv)
{
return 0;
}
-static ssize_t Memcpy_Dma_write (struct device *device,struct device_attribute *attr, void *argv)//(struct device_driver *device, const char *argv,size_t count)
+static ssize_t memcpy_dma_write (struct device *device,struct device_attribute *attr, void *argv)//(struct device_driver *device, const char *argv,size_t count)
{
int dma_flag;
u32 mcode_sbus;
@@ -53,8 +53,8 @@ static ssize_t Memcpy_Dma_write (struct device *device,struct device_attribute *
struct Dma_MemToMem *DmaMemInfo = (struct Dma_MemToMem *)argv;
- dma_flag = rk29_dma_request(DMACH_DMAC0_MemToMem, &rk29_dma_Memcpy_client, NULL);
- dma_flag = DMACH_DMAC0_MemToMem;
+ dma_flag = rk29_dma_request(DMACH_DMAC0_MEMTOMEM, &rk29_dma_memcpy_client, NULL);
+ dma_flag = DMACH_DMAC0_MEMTOMEM;
rt = rk29_dma_devconfig(dma_flag, RK29_DMASRC_MEMTOMEM, DmaMemInfo->SrcAddr);
rt = rk29_dma_config(dma_flag, 8);
@@ -62,18 +62,18 @@ static ssize_t Memcpy_Dma_write (struct device *device,struct device_attribute *
rt = rk29_dma_enqueue(dma_flag, NULL, DmaMemInfo->DstAddr, DmaMemInfo->MenSize);
rt = rk29_dma_ctrl(dma_flag, RK29_DMAOP_START);
wait_event_interruptible_timeout(wq, wq_condition, HZ/20);
- wq_condition = 0;
+ wq_condition = 0;
return 0;
}
-static DRIVER_ATTR(DmaMemcpy, S_IRUGO|S_IALLUGO, Memcpy_Dma_read, Memcpy_Dma_write);
+static DRIVER_ATTR(dmamemcpy, S_IRUGO|S_IALLUGO, memcpy_dma_read, memcpy_dma_write);
static int __init dma_memcpy_probe(struct platform_device *pdev)
{
int ret;
- ret = device_create_file(&pdev->dev, &driver_attr_DmaMemcpy);
+ ret = device_create_file(&pdev->dev, &driver_attr_dmamemcpy);
if(ret)
{
printk(">> fb1 dsp win0 info device_create_file err\n");
@@ -86,7 +86,7 @@ static int __init dma_memcpy_probe(struct platform_device *pdev)
static int dma_memcpy_remove(struct platform_device *pdev)
{
int ret;
- driver_remove_file(&pdev->dev, &driver_attr_DmaMemcpy);
+ driver_remove_file(&pdev->dev, &driver_attr_dmamemcpy);
return 0;
}