[v1,4/4] mfd: core: Remove support for dangling device properties
diff mbox series

Message ID 20210301144222.31290-4-andriy.shevchenko@linux.intel.com
State Accepted
Commit b4a66acc0997cff7cb9a4c3992e97808700aa1ff
Headers show
Series
  • [v1,1/4] mfd: core: Add support for software nodes
Related show

Commit Message

Andy Shevchenko March 1, 2021, 2:42 p.m. UTC
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>

From now on only accepting complete software nodes.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/mfd/mfd-core.c   | 6 ------
 include/linux/mfd/core.h | 4 ----
 2 files changed, 10 deletions(-)

Comments

Lee Jones March 22, 2021, 2:39 p.m. UTC | #1
On Mon, 01 Mar 2021, Andy Shevchenko wrote:

> From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> 
> From now on only accepting complete software nodes.
> 
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  drivers/mfd/mfd-core.c   | 6 ------
>  include/linux/mfd/core.h | 4 ----
>  2 files changed, 10 deletions(-)

Applied, thanks.

Patch
diff mbox series

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index e24008b94aac..6dcff4b8e15e 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -238,12 +238,6 @@  static int mfd_add_device(struct device *parent, int id,
 			goto fail_of_entry;
 	}
 
-	if (cell->properties) {
-		ret = platform_device_add_properties(pdev, cell->properties);
-		if (ret)
-			goto fail_of_entry;
-	}
-
 	if (cell->swnode) {
 		ret = device_add_software_node(&pdev->dev, cell->swnode);
 		if (ret)
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index 9ec599167fe6..0bc7cba798a3 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -51,7 +51,6 @@ 
 
 struct irq_domain;
 struct software_node;
-struct property_entry;
 
 /* Matches ACPI PNP id, either _HID or _CID, or ACPI _ADR */
 struct mfd_cell_acpi_match {
@@ -82,9 +81,6 @@  struct mfd_cell {
 	/* Software node for the device. */
 	const struct software_node *swnode;
 
-	/* device properties passed to the sub devices drivers */
-	const struct property_entry *properties;
-
 	/*
 	 * Device Tree compatible string
 	 * See: Documentation/devicetree/usage-model.rst Chapter 2.2 for details