Skip to contentSkip to conversation

dmaengine: idma64: Move driver name to the header

PATCH Applied Andy Shevchenko 3 participants 4 messages Apr 9, 2019 – Apr 26, 2019

Subsystems (3)
lore
Share & tools
lore

Andy Shevchenko

author reviewer
#0 lore raw

PATCH 1/1 dmaengine: idma64: Move driver name to the header

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.

---
 drivers/dma/idma64.c       |  9 ++++-----
 drivers/mfd/intel-lpss.c   |  4 ++--
 include/linux/dma/idma64.h | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 include/linux/dma/idma64.h
drivers/dma/idma64.c +4 -5
index 0baf9797cc09..4180cf197823 100644
@@ -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
@@ -697,7 +696,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,
 	},
 };
@@ -707,4 +706,4 @@ module_platform_driver(idma64_platform_driver);
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("iDMA64 core driver");
 MODULE_AUTHOR("Andy Shevchenko <[email protected]>");
-MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_ALIAS("platform:" LPSS_IDMA64_DRIVER_NAME);
drivers/mfd/intel-lpss.c +2 -2
index 50bffc3382d7..45221e092ecf 100644
@@ -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
@@ -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
include/linux/dma/idma64.h new file +14 -0
new file mode 100644
index 000000000000..621cfae60554
@@ -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__ */
#1 lore raw
Quoted 3 lines · Andy Shevchenko

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.

Hmm. Why do we have two separate drivers for the same name?

Something is rather fishy there.

author reviewer
#2 lore raw
Quoted 8 lines · Christoph Hellwig
Quoted 3 lines · Andy Shevchenko

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.

Hmm. Why do we have two separate drivers for the same name?

Something is rather fishy there.

We would like to be sure that the DMA controller driver is loaded before its consumers.

maintainer Applied
#3 lore raw
In reply to Andy Shevchenko
Quoted 3 lines · Andy Shevchenko

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.

Applied, thanks