Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 00:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dma: mv_xor: rename many symbols to remove the 'shared' word

Browse Source 
The 'shared' word no longer makes sense in a number of places as we
renamed the 'mv_xor_shared' driver to 'mv_xor'.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2012-10-30 12:05:40 +01:00
parent 0dddee7a7d
commit 61971656ce
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/dma/mv_xor.c
View File

@ -1097,7 +1097,7 @@ static int mv_xor_channel_remove(struct mv_xor_device *device)
} }
static struct mv_xor_device * static struct mv_xor_device *
mv_xor_channel_add(struct mv_xor_shared_private *msp, mv_xor_channel_add(struct mv_xor_private *msp,
struct platform_device *pdev, struct platform_device *pdev,
int hw_id, dma_cap_mask_t cap_mask, int hw_id, dma_cap_mask_t cap_mask,
size_t pool_size, int irq) size_t pool_size, int irq)
@ -1220,7 +1220,7 @@ mv_xor_channel_add(struct mv_xor_shared_private *msp,
} }
static void static void
mv_xor_conf_mbus_windows(struct mv_xor_shared_private *msp, mv_xor_conf_mbus_windows(struct mv_xor_private *msp,
const struct mbus_dram_target_info *dram) const struct mbus_dram_target_info *dram)
{ {
void __iomem *base = msp->xor_base; void __iomem *base = msp->xor_base;
@ -1250,15 +1250,15 @@ mv_xor_conf_mbus_windows(struct mv_xor_shared_private *msp,
writel(win_enable, base + WINDOW_BAR_ENABLE(1)); writel(win_enable, base + WINDOW_BAR_ENABLE(1));
} }
static int mv_xor_shared_probe(struct platform_device *pdev) static int mv_xor_probe(struct platform_device *pdev)
{ {
const struct mbus_dram_target_info *dram; const struct mbus_dram_target_info *dram;
struct mv_xor_shared_private *msp; struct mv_xor_private *msp;
struct mv_xor_platform_data *pdata = pdev->dev.platform_data; struct mv_xor_platform_data *pdata = pdev->dev.platform_data;
struct resource *res; struct resource *res;
int i, ret; int i, ret;
dev_notice(&pdev->dev, "Marvell shared XOR driver\n"); dev_notice(&pdev->dev, "Marvell XOR driver\n");
msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL); msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL);
if (!msp) if (!msp)
@ -1338,9 +1338,9 @@ err_channel_add:
return ret; return ret;
} }
static int mv_xor_shared_remove(struct platform_device *pdev) static int mv_xor_remove(struct platform_device *pdev)
{ {
struct mv_xor_shared_private *msp = platform_get_drvdata(pdev); struct mv_xor_private *msp = platform_get_drvdata(pdev);
int i; int i;
for (i = 0; i < MV_XOR_MAX_CHANNELS; i++) { for (i = 0; i < MV_XOR_MAX_CHANNELS; i++) {
@ -1356,9 +1356,9 @@ static int mv_xor_shared_remove(struct platform_device *pdev)
return 0; return 0;
} }
static struct platform_driver mv_xor_shared_driver = { static struct platform_driver mv_xor_driver = {
.probe = mv_xor_shared_probe, .probe = mv_xor_probe,
.remove = mv_xor_shared_remove, .remove = mv_xor_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = MV_XOR_NAME, .name = MV_XOR_NAME,
@ -1368,7 +1368,7 @@ static struct platform_driver mv_xor_shared_driver = {
static int __init mv_xor_init(void) static int __init mv_xor_init(void)
{ {
return platform_driver_register(&mv_xor_shared_driver); return platform_driver_register(&mv_xor_driver);
} }
module_init(mv_xor_init); module_init(mv_xor_init);
@ -1376,7 +1376,7 @@ module_init(mv_xor_init);
#if 0 #if 0
static void __exit mv_xor_exit(void) static void __exit mv_xor_exit(void)
{ {
platform_driver_unregister(&mv_xor_shared_driver); platform_driver_unregister(&mv_xor_driver);
return; return;
} }

4
drivers/dma/mv_xor.h
View File

@ -53,7 +53,7 @@
#define WINDOW_REMAP_HIGH(w) (0x290 + ((w) << 2)) #define WINDOW_REMAP_HIGH(w) (0x290 + ((w) << 2))
#define WINDOW_BAR_ENABLE(chan) (0x240 + ((chan) << 2)) #define WINDOW_BAR_ENABLE(chan) (0x240 + ((chan) << 2))
struct mv_xor_shared_private { struct mv_xor_private {
void __iomem *xor_base; void __iomem *xor_base;
void __iomem *xor_high_base; void __iomem *xor_high_base;
struct clk *clk; struct clk *clk;
@ -76,7 +76,7 @@ struct mv_xor_device {
void *dma_desc_pool_virt; void *dma_desc_pool_virt;
size_t pool_size; size_t pool_size;
struct dma_device common; struct dma_device common;
struct mv_xor_shared_private *shared; struct mv_xor_private *shared;
}; };
/** /**