Commit b4a66acc authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Lee Jones
Browse files

mfd: core: Remove support for dangling device properties 



From now on only accepting complete software nodes.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 03152e35

drivers/mfd/mfd-core.c

+0 −6
Original line number Diff line number Diff line
@@ -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)

include/linux/mfd/core.h

+0 −4
Original line number Diff line number Diff line
@@ -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