Skip to content

Commit

Permalink
dmaengine: idma64: Move driver name to the header
Browse files Browse the repository at this point in the history
There are two drivers that are relying on the iDMA 64-bit driver name
to match. Instead of duplicating string in both of them, dedicate
a header file and share it between users.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
  • Loading branch information
Andy Shevchenko authored and Vinod Koul committed Apr 26, 2019
1 parent c7266d2 commit ffcfc20
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 7 deletions.
9 changes: 4 additions & 5 deletions drivers/dma/idma64.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
#include <linux/platform_device.h>
#include <linux/slab.h>

#include "idma64.h"
#include <linux/dma/idma64.h>

/* Platform driver name */
#define DRV_NAME "idma64"
#include "idma64.h"

/* For now we support only two channels */
#define IDMA64_NR_CHAN 2
Expand Down Expand Up @@ -699,7 +698,7 @@ static struct platform_driver idma64_platform_driver = {
.probe = idma64_platform_probe,
.remove = idma64_platform_remove,
.driver = {
.name = DRV_NAME,
.name = LPSS_IDMA64_DRIVER_NAME,
.pm = &idma64_dev_pm_ops,
},
};
Expand All @@ -709,4 +708,4 @@ module_platform_driver(idma64_platform_driver);
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("iDMA64 core driver");
MODULE_AUTHOR("Andy Shevchenko <andriy.shevchenko@linux.intel.com>");
MODULE_ALIAS("platform:" DRV_NAME);
MODULE_ALIAS("platform:" LPSS_IDMA64_DRIVER_NAME);
4 changes: 2 additions & 2 deletions drivers/mfd/intel-lpss.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include <linux/seq_file.h>
#include <linux/io-64-nonatomic-lo-hi.h>

#include <linux/dma/idma64.h>

#include "intel-lpss.h"

#define LPSS_DEV_OFFSET 0x000
Expand Down Expand Up @@ -96,8 +98,6 @@ static const struct resource intel_lpss_idma64_resources[] = {
DEFINE_RES_IRQ(0),
};

#define LPSS_IDMA64_DRIVER_NAME "idma64"

/*
* Cells needs to be ordered so that the iDMA is created first. This is
* because we need to be sure the DMA is available when the host controller
Expand Down
14 changes: 14 additions & 0 deletions include/linux/dma/idma64.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Definitions for the Intel integrated DMA 64-bit
*
* Copyright (C) 2019 Intel Corporation
*/

#ifndef __LINUX_DMA_IDMA64_H__
#define __LINUX_DMA_IDMA64_H__

/* Platform driver name */
#define LPSS_IDMA64_DRIVER_NAME "idma64"

#endif /* __LINUX_DMA_IDMA64_H__ */

0 comments on commit ffcfc20

Please sign in to comment.