From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: Re: [PATCH] device property: don't bother the drivers with struct property_set Date: Fri, 26 Feb 2016 16:35:26 +0200 Message-ID: <1456497326.13244.151.camel@linux.intel.com> References: <1456485600-129229-1-git-send-email-heikki.krogerus@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mga02.intel.com ([134.134.136.20]:43538 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753125AbcBZOeo (ORCPT ); Fri, 26 Feb 2016 09:34:44 -0500 In-Reply-To: <1456485600-129229-1-git-send-email-heikki.krogerus@linux.intel.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Heikki Krogerus , "Rafael J. Wysocki" Cc: Lee Jones , Mika Westerberg , Thierry Reding , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org On Fri, 2016-02-26 at 13:20 +0200, Heikki Krogerus wrote: > Since device_add_property_set() now always takes a copy of > the property_set, and also since the fwnode type is always > hard coded to be FWNODE_PDATA, there is no need for the > drivers to deliver the entire struct property_set. The > function can just create the instance of it on its own and > bind the properties from the drivers to it on the spot. >=20 > This renames device_add_property_set() to > device_add_properties(). The function now takes struct > property_entry as its parameter instead of struct > property_set. Rationale IIUC is the eliminating of an extra structure definition in users. =46WIW: Reviewed-by: Andy Shevchenko >=20 > Signed-off-by: Heikki Krogerus > --- > =C2=A0arch/arm/mach-tegra/board-paz00.c |=C2=A0=C2=A06 +----- > =C2=A0drivers/base/platform.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0| 19 ++++++++++--------- > =C2=A0drivers/base/property.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0| 35 ++++++++++++++++++++++------- > ------ > =C2=A0drivers/mfd/intel-lpss-acpi.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2= =A0=C2=A06 +----- > =C2=A0drivers/mfd/intel-lpss-pci.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= | 14 +++----------- > =C2=A0drivers/mfd/intel-lpss.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A02 +- > =C2=A0drivers/mfd/intel-lpss.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A02 +- > =C2=A0drivers/mfd/mfd-core.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A04 ++-- > =C2=A0include/linux/mfd/core.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A02 +- > =C2=A0include/linux/platform_device.h=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A04= ++-- > =C2=A0include/linux/property.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0| 15 +++------------ > =C2=A011 files changed, 47 insertions(+), 62 deletions(-) >=20 > Hi Rafael, >=20 > This depends on Johannes' wireless next tree: > git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git >=20 >=20 > diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach- > tegra/board-paz00.c > index 52db8bf..7478f6f 100644 > --- a/arch/arm/mach-tegra/board-paz00.c > +++ b/arch/arm/mach-tegra/board-paz00.c > @@ -29,10 +29,6 @@ static struct property_entry __initdata > wifi_rfkill_prop[] =3D { > =C2=A0 { }, > =C2=A0}; > =C2=A0 > -static struct property_set __initdata wifi_rfkill_pset =3D { > - .properties =3D wifi_rfkill_prop, > -}; > - > =C2=A0static struct platform_device wifi_rfkill_device =3D { > =C2=A0 .name =3D "rfkill_gpio", > =C2=A0 .id =3D -1, > @@ -49,7 +45,7 @@ static struct gpiod_lookup_table wifi_gpio_lookup =3D > { > =C2=A0 > =C2=A0void __init tegra_paz00_wifikill_init(void) > =C2=A0{ > - platform_device_add_properties(&wifi_rfkill_device, > &wifi_rfkill_pset); > + platform_device_add_properties(&wifi_rfkill_device, > wifi_rfkill_prop); > =C2=A0 gpiod_add_lookup_table(&wifi_gpio_lookup); > =C2=A0 platform_device_register(&wifi_rfkill_device); > =C2=A0} > diff --git a/drivers/base/platform.c b/drivers/base/platform.c > index f437afa..6482d47 100644 > --- a/drivers/base/platform.c > +++ b/drivers/base/platform.c > @@ -322,16 +322,16 @@ EXPORT_SYMBOL_GPL(platform_device_add_data); > =C2=A0/** > =C2=A0 * platform_device_add_properties - add built-in properties to = a > platform device > =C2=A0 * @pdev: platform device to add properties to > - * @pset: properties to add > + * @properties: null terminated array of properties to add > =C2=A0 * > - * The function will take deep copy of the properties in @pset and > attach > - * the copy to the platform device. The memory associated with > properties > - * will be freed when the platform device is released. > + * The function will take deep copy of @properties and attach the > copy to the > + * platform device. The memory associated with properties will be > freed when the > + * platform device is released. > =C2=A0 */ > =C2=A0int platform_device_add_properties(struct platform_device *pdev= , > - =C2=A0=C2=A0=C2=A0const struct property_set *pset) > + =C2=A0=C2=A0=C2=A0struct property_entry > *properties) > =C2=A0{ > - return device_add_property_set(&pdev->dev, pset); > + return device_add_properties(&pdev->dev, properties); > =C2=A0} > =C2=A0EXPORT_SYMBOL_GPL(platform_device_add_properties); > =C2=A0 > @@ -447,7 +447,7 @@ void platform_device_del(struct platform_device > *pdev) > =C2=A0 release_resource(r); > =C2=A0 } > =C2=A0 > - device_remove_property_set(&pdev->dev); > + device_remove_properties(&pdev->dev); > =C2=A0 } > =C2=A0} > =C2=A0EXPORT_SYMBOL_GPL(platform_device_del); > @@ -526,8 +526,9 @@ struct platform_device > *platform_device_register_full( > =C2=A0 if (ret) > =C2=A0 goto err; > =C2=A0 > - if (pdevinfo->pset) { > - ret =3D platform_device_add_properties(pdev, pdevinfo- > >pset); > + if (pdevinfo->properties) { > + ret =3D platform_device_add_properties(pdev, > + =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0pdevinfo- > >properties); > =C2=A0 if (ret) > =C2=A0 goto err; > =C2=A0 } > diff --git a/drivers/base/property.c b/drivers/base/property.c > index 167f0a9..8442033 100644 > --- a/drivers/base/property.c > +++ b/drivers/base/property.c > @@ -19,6 +19,11 @@ > =C2=A0#include > =C2=A0#include > =C2=A0 > +struct property_set { > + struct fwnode_handle fwnode; > + struct property_entry *properties; > +}; > + > =C2=A0static inline bool is_pset_node(struct fwnode_handle *fwnode) > =C2=A0{ > =C2=A0 return fwnode && fwnode->type =3D=3D FWNODE_PDATA; > @@ -797,14 +802,14 @@ static struct property_set *pset_copy_set(const > struct property_set *pset) > =C2=A0} > =C2=A0 > =C2=A0/** > - * device_remove_property_set - Remove properties from a device > object. > + * device_remove_properties - Remove properties from a device > object. > =C2=A0 * @dev: Device whose properties to remove. > =C2=A0 * > =C2=A0 * The function removes properties previously associated to the > device > - * secondary firmware node with device_add_property_set(). Memory > allocated > + * secondary firmware node with device_add_properties(). Memory > allocated > =C2=A0 * to the properties will also be released. > =C2=A0 */ > -void device_remove_property_set(struct device *dev) > +void device_remove_properties(struct device *dev) > =C2=A0{ > =C2=A0 struct fwnode_handle *fwnode; > =C2=A0 > @@ -822,24 +827,28 @@ void device_remove_property_set(struct device > *dev) > =C2=A0 pset_free_set(to_pset_node(fwnode)); > =C2=A0 set_secondary_fwnode(dev, NULL); > =C2=A0} > -EXPORT_SYMBOL_GPL(device_remove_property_set); > +EXPORT_SYMBOL_GPL(device_remove_properties); > =C2=A0 > =C2=A0/** > - * device_add_property_set - Add a collection of properties to a > device object. > + * device_add_properties - Add a collection of properties to a > device object. > =C2=A0 * @dev: Device to add properties to. > - * @pset: Collection of properties to add. > + * @properties: Collection of properties to add. > =C2=A0 * > - * Associate a collection of device properties represented by @pset > with @dev > - * as its secondary firmware node. The function takes a copy of > @pset. > + * Associate a collection of device properties represented by > @properties with > + * @dev as its secondary firmware node. The function takes a copy of > + * @properties. > =C2=A0 */ > -int device_add_property_set(struct device *dev, const struct > property_set *pset) > +int device_add_properties(struct device *dev, > + =C2=A0=C2=A0struct property_entry *properties) > =C2=A0{ > - struct property_set *p; > + struct property_set *p, pset; > =C2=A0 > - if (!pset) > + if (!properties) > =C2=A0 return -EINVAL; > =C2=A0 > - p =3D pset_copy_set(pset); > + pset.properties =3D properties; > + > + p =3D pset_copy_set(&pset); > =C2=A0 if (IS_ERR(p)) > =C2=A0 return PTR_ERR(p); > =C2=A0 > @@ -847,7 +856,7 @@ int device_add_property_set(struct device *dev, > const struct property_set *pset) > =C2=A0 set_secondary_fwnode(dev, &p->fwnode); > =C2=A0 return 0; > =C2=A0} > -EXPORT_SYMBOL_GPL(device_add_property_set); > +EXPORT_SYMBOL_GPL(device_add_properties); > =C2=A0 > =C2=A0/** > =C2=A0 * device_get_next_child_node - Return the next child node hand= le > for a device > diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss- > acpi.c > index 06f00d6..8e94ad2 100644 > --- a/drivers/mfd/intel-lpss-acpi.c > +++ b/drivers/mfd/intel-lpss-acpi.c > @@ -31,13 +31,9 @@ static struct property_entry spt_i2c_properties[] > =3D { > =C2=A0 { }, > =C2=A0}; > =C2=A0 > -static struct property_set spt_i2c_pset =3D { > - .properties =3D spt_i2c_properties, > -}; > - > =C2=A0static const struct intel_lpss_platform_info spt_i2c_info =3D { > =C2=A0 .clk_rate =3D 120000000, > - .pset =3D &spt_i2c_pset, > + .properties =3D spt_i2c_properties, > =C2=A0}; > =C2=A0 > =C2=A0static const struct intel_lpss_platform_info bxt_info =3D { > diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss- > pci.c > index afc7af9..5855cce 100644 > --- a/drivers/mfd/intel-lpss-pci.c > +++ b/drivers/mfd/intel-lpss-pci.c > @@ -71,13 +71,9 @@ static struct property_entry spt_i2c_properties[] > =3D { > =C2=A0 { }, > =C2=A0}; > =C2=A0 > -static struct property_set spt_i2c_pset =3D { > - .properties =3D spt_i2c_properties, > -}; > - > =C2=A0static const struct intel_lpss_platform_info spt_i2c_info =3D { > =C2=A0 .clk_rate =3D 120000000, > - .pset =3D &spt_i2c_pset, > + .properties =3D spt_i2c_properties, > =C2=A0}; > =C2=A0 > =C2=A0static struct property_entry uart_properties[] =3D { > @@ -87,14 +83,10 @@ static struct property_entry uart_properties[] =3D > { > =C2=A0 { }, > =C2=A0}; > =C2=A0 > -static struct property_set uart_pset =3D { > - .properties =3D uart_properties, > -}; > - > =C2=A0static const struct intel_lpss_platform_info spt_uart_info =3D = { > =C2=A0 .clk_rate =3D 120000000, > =C2=A0 .clk_con_id =3D "baudclk", > - .pset =3D &uart_pset, > + .properties =3D uart_properties, > =C2=A0}; > =C2=A0 > =C2=A0static const struct intel_lpss_platform_info bxt_info =3D { > @@ -104,7 +96,7 @@ static const struct intel_lpss_platform_info > bxt_info =3D { > =C2=A0static const struct intel_lpss_platform_info bxt_uart_info =3D = { > =C2=A0 .clk_rate =3D 100000000, > =C2=A0 .clk_con_id =3D "baudclk", > - .pset =3D &uart_pset, > + .properties =3D uart_properties, > =C2=A0}; > =C2=A0 > =C2=A0static const struct intel_lpss_platform_info bxt_i2c_info =3D { > diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c > index 1bbbe87..6352aab 100644 > --- a/drivers/mfd/intel-lpss.c > +++ b/drivers/mfd/intel-lpss.c > @@ -407,7 +407,7 @@ int intel_lpss_probe(struct device *dev, > =C2=A0 if (ret) > =C2=A0 return ret; > =C2=A0 > - lpss->cell->pset =3D info->pset; > + lpss->cell->properties =3D info->properties; > =C2=A0 > =C2=A0 intel_lpss_init_dev(lpss); > =C2=A0 > diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h > index 0dcea9e..d064973 100644 > --- a/drivers/mfd/intel-lpss.h > +++ b/drivers/mfd/intel-lpss.h > @@ -23,7 +23,7 @@ struct intel_lpss_platform_info { > =C2=A0 int irq; > =C2=A0 unsigned long clk_rate; > =C2=A0 const char *clk_con_id; > - struct property_set *pset; > + struct property_entry *properties; > =C2=A0}; > =C2=A0 > =C2=A0int intel_lpss_probe(struct device *dev, > diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c > index 88bd1b1..fc1c1fc 100644 > --- a/drivers/mfd/mfd-core.c > +++ b/drivers/mfd/mfd-core.c > @@ -193,8 +193,8 @@ static int mfd_add_device(struct device *parent, > int id, > =C2=A0 goto fail_alias; > =C2=A0 } > =C2=A0 > - if (cell->pset) { > - ret =3D platform_device_add_properties(pdev, cell- > >pset); > + if (cell->properties) { > + ret =3D platform_device_add_properties(pdev, cell- > >properties); > =C2=A0 if (ret) > =C2=A0 goto fail_alias; > =C2=A0 } > diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h > index 1a5a87f..ba9d79f 100644 > --- a/include/linux/mfd/core.h > +++ b/include/linux/mfd/core.h > @@ -73,7 +73,7 @@ struct mfd_cell { > =C2=A0 size_t pdata_size; > =C2=A0 > =C2=A0 /* device properties passed to the sub devices drivers */ > - const struct property_set *pset; > + struct property_entry *properties; > =C2=A0 > =C2=A0 /* > =C2=A0 =C2=A0* Device Tree compatible string > diff --git a/include/linux/platform_device.h > b/include/linux/platform_device.h > index 03b7555..66dca60 100644 > --- a/include/linux/platform_device.h > +++ b/include/linux/platform_device.h > @@ -73,7 +73,7 @@ struct platform_device_info { > =C2=A0 size_t size_data; > =C2=A0 u64 dma_mask; > =C2=A0 > - const struct property_set *pset; > + struct property_entry *properties; > =C2=A0}; > =C2=A0extern struct platform_device *platform_device_register_full( > =C2=A0 const struct platform_device_info *pdevinfo); > @@ -172,7 +172,7 @@ extern int platform_device_add_resources(struct > platform_device *pdev, > =C2=A0extern int platform_device_add_data(struct platform_device *pde= v, > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0const void *data, size_t size); > =C2=A0extern int platform_device_add_properties(struct platform_devic= e > *pdev, > - =C2=A0=C2=A0const struct property_set > *pset); > + =C2=A0=C2=A0struct property_entry > *properties); > =C2=A0extern int platform_device_add(struct platform_device *pdev); > =C2=A0extern void platform_device_del(struct platform_device *pdev); > =C2=A0extern void platform_device_put(struct platform_device *pdev); > diff --git a/include/linux/property.h b/include/linux/property.h > index b51fcd3..ecab11e 100644 > --- a/include/linux/property.h > +++ b/include/linux/property.h > @@ -238,18 +238,9 @@ struct property_entry { > =C2=A0 .name =3D _name_, \ > =C2=A0} > =C2=A0 > -/** > - * struct property_set - Collection of "built-in" device properties. > - * @fwnode: Handle to be pointed to by the fwnode field of struct > device. > - * @properties: Array of properties terminated with a null entry. > - */ > -struct property_set { > - struct fwnode_handle fwnode; > - struct property_entry *properties; > -}; > - > -int device_add_property_set(struct device *dev, const struct > property_set *pset); > -void device_remove_property_set(struct device *dev); > +int device_add_properties(struct device *dev, > + =C2=A0=C2=A0struct property_entry *properties); > +void device_remove_properties(struct device *dev); > =C2=A0 > =C2=A0bool device_dma_supported(struct device *dev); > =C2=A0 --=20 Andy Shevchenko Intel Finland Oy -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932888AbcBZOeq (ORCPT ); Fri, 26 Feb 2016 09:34:46 -0500 Received: from mga02.intel.com ([134.134.136.20]:43538 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753125AbcBZOeo (ORCPT ); Fri, 26 Feb 2016 09:34:44 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,498,1449561600"; d="scan'208";a="911877115" Message-ID: <1456497326.13244.151.camel@linux.intel.com> Subject: Re: [PATCH] device property: don't bother the drivers with struct property_set From: Andy Shevchenko To: Heikki Krogerus , "Rafael J. Wysocki" Cc: Lee Jones , Mika Westerberg , Thierry Reding , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Date: Fri, 26 Feb 2016 16:35:26 +0200 In-Reply-To: <1456485600-129229-1-git-send-email-heikki.krogerus@linux.intel.com> References: <1456485600-129229-1-git-send-email-heikki.krogerus@linux.intel.com> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.3-1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2016-02-26 at 13:20 +0200, Heikki Krogerus wrote: > Since device_add_property_set() now always takes a copy of > the property_set, and also since the fwnode type is always > hard coded to be FWNODE_PDATA, there is no need for the > drivers to deliver the entire struct property_set. The > function can just create the instance of it on its own and > bind the properties from the drivers to it on the spot. > > This renames device_add_property_set() to > device_add_properties(). The function now takes struct > property_entry as its parameter instead of struct > property_set. Rationale IIUC is the eliminating of an extra structure definition in users. FWIW: Reviewed-by: Andy Shevchenko > > Signed-off-by: Heikki Krogerus > --- >  arch/arm/mach-tegra/board-paz00.c |  6 +----- >  drivers/base/platform.c           | 19 ++++++++++--------- >  drivers/base/property.c           | 35 ++++++++++++++++++++++------- > ------ >  drivers/mfd/intel-lpss-acpi.c     |  6 +----- >  drivers/mfd/intel-lpss-pci.c      | 14 +++----------- >  drivers/mfd/intel-lpss.c          |  2 +- >  drivers/mfd/intel-lpss.h          |  2 +- >  drivers/mfd/mfd-core.c            |  4 ++-- >  include/linux/mfd/core.h          |  2 +- >  include/linux/platform_device.h   |  4 ++-- >  include/linux/property.h          | 15 +++------------ >  11 files changed, 47 insertions(+), 62 deletions(-) > > Hi Rafael, > > This depends on Johannes' wireless next tree: > git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git > > > diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach- > tegra/board-paz00.c > index 52db8bf..7478f6f 100644 > --- a/arch/arm/mach-tegra/board-paz00.c > +++ b/arch/arm/mach-tegra/board-paz00.c > @@ -29,10 +29,6 @@ static struct property_entry __initdata > wifi_rfkill_prop[] = { >   { }, >  }; >   > -static struct property_set __initdata wifi_rfkill_pset = { > - .properties = wifi_rfkill_prop, > -}; > - >  static struct platform_device wifi_rfkill_device = { >   .name = "rfkill_gpio", >   .id = -1, > @@ -49,7 +45,7 @@ static struct gpiod_lookup_table wifi_gpio_lookup = > { >   >  void __init tegra_paz00_wifikill_init(void) >  { > - platform_device_add_properties(&wifi_rfkill_device, > &wifi_rfkill_pset); > + platform_device_add_properties(&wifi_rfkill_device, > wifi_rfkill_prop); >   gpiod_add_lookup_table(&wifi_gpio_lookup); >   platform_device_register(&wifi_rfkill_device); >  } > diff --git a/drivers/base/platform.c b/drivers/base/platform.c > index f437afa..6482d47 100644 > --- a/drivers/base/platform.c > +++ b/drivers/base/platform.c > @@ -322,16 +322,16 @@ EXPORT_SYMBOL_GPL(platform_device_add_data); >  /** >   * platform_device_add_properties - add built-in properties to a > platform device >   * @pdev: platform device to add properties to > - * @pset: properties to add > + * @properties: null terminated array of properties to add >   * > - * The function will take deep copy of the properties in @pset and > attach > - * the copy to the platform device. The memory associated with > properties > - * will be freed when the platform device is released. > + * The function will take deep copy of @properties and attach the > copy to the > + * platform device. The memory associated with properties will be > freed when the > + * platform device is released. >   */ >  int platform_device_add_properties(struct platform_device *pdev, > -    const struct property_set *pset) > +    struct property_entry > *properties) >  { > - return device_add_property_set(&pdev->dev, pset); > + return device_add_properties(&pdev->dev, properties); >  } >  EXPORT_SYMBOL_GPL(platform_device_add_properties); >   > @@ -447,7 +447,7 @@ void platform_device_del(struct platform_device > *pdev) >   release_resource(r); >   } >   > - device_remove_property_set(&pdev->dev); > + device_remove_properties(&pdev->dev); >   } >  } >  EXPORT_SYMBOL_GPL(platform_device_del); > @@ -526,8 +526,9 @@ struct platform_device > *platform_device_register_full( >   if (ret) >   goto err; >   > - if (pdevinfo->pset) { > - ret = platform_device_add_properties(pdev, pdevinfo- > >pset); > + if (pdevinfo->properties) { > + ret = platform_device_add_properties(pdev, > +      pdevinfo- > >properties); >   if (ret) >   goto err; >   } > diff --git a/drivers/base/property.c b/drivers/base/property.c > index 167f0a9..8442033 100644 > --- a/drivers/base/property.c > +++ b/drivers/base/property.c > @@ -19,6 +19,11 @@ >  #include >  #include >   > +struct property_set { > + struct fwnode_handle fwnode; > + struct property_entry *properties; > +}; > + >  static inline bool is_pset_node(struct fwnode_handle *fwnode) >  { >   return fwnode && fwnode->type == FWNODE_PDATA; > @@ -797,14 +802,14 @@ static struct property_set *pset_copy_set(const > struct property_set *pset) >  } >   >  /** > - * device_remove_property_set - Remove properties from a device > object. > + * device_remove_properties - Remove properties from a device > object. >   * @dev: Device whose properties to remove. >   * >   * The function removes properties previously associated to the > device > - * secondary firmware node with device_add_property_set(). Memory > allocated > + * secondary firmware node with device_add_properties(). Memory > allocated >   * to the properties will also be released. >   */ > -void device_remove_property_set(struct device *dev) > +void device_remove_properties(struct device *dev) >  { >   struct fwnode_handle *fwnode; >   > @@ -822,24 +827,28 @@ void device_remove_property_set(struct device > *dev) >   pset_free_set(to_pset_node(fwnode)); >   set_secondary_fwnode(dev, NULL); >  } > -EXPORT_SYMBOL_GPL(device_remove_property_set); > +EXPORT_SYMBOL_GPL(device_remove_properties); >   >  /** > - * device_add_property_set - Add a collection of properties to a > device object. > + * device_add_properties - Add a collection of properties to a > device object. >   * @dev: Device to add properties to. > - * @pset: Collection of properties to add. > + * @properties: Collection of properties to add. >   * > - * Associate a collection of device properties represented by @pset > with @dev > - * as its secondary firmware node. The function takes a copy of > @pset. > + * Associate a collection of device properties represented by > @properties with > + * @dev as its secondary firmware node. The function takes a copy of > + * @properties. >   */ > -int device_add_property_set(struct device *dev, const struct > property_set *pset) > +int device_add_properties(struct device *dev, > +   struct property_entry *properties) >  { > - struct property_set *p; > + struct property_set *p, pset; >   > - if (!pset) > + if (!properties) >   return -EINVAL; >   > - p = pset_copy_set(pset); > + pset.properties = properties; > + > + p = pset_copy_set(&pset); >   if (IS_ERR(p)) >   return PTR_ERR(p); >   > @@ -847,7 +856,7 @@ int device_add_property_set(struct device *dev, > const struct property_set *pset) >   set_secondary_fwnode(dev, &p->fwnode); >   return 0; >  } > -EXPORT_SYMBOL_GPL(device_add_property_set); > +EXPORT_SYMBOL_GPL(device_add_properties); >   >  /** >   * device_get_next_child_node - Return the next child node handle > for a device > diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss- > acpi.c > index 06f00d6..8e94ad2 100644 > --- a/drivers/mfd/intel-lpss-acpi.c > +++ b/drivers/mfd/intel-lpss-acpi.c > @@ -31,13 +31,9 @@ static struct property_entry spt_i2c_properties[] > = { >   { }, >  }; >   > -static struct property_set spt_i2c_pset = { > - .properties = spt_i2c_properties, > -}; > - >  static const struct intel_lpss_platform_info spt_i2c_info = { >   .clk_rate = 120000000, > - .pset = &spt_i2c_pset, > + .properties = spt_i2c_properties, >  }; >   >  static const struct intel_lpss_platform_info bxt_info = { > diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss- > pci.c > index afc7af9..5855cce 100644 > --- a/drivers/mfd/intel-lpss-pci.c > +++ b/drivers/mfd/intel-lpss-pci.c > @@ -71,13 +71,9 @@ static struct property_entry spt_i2c_properties[] > = { >   { }, >  }; >   > -static struct property_set spt_i2c_pset = { > - .properties = spt_i2c_properties, > -}; > - >  static const struct intel_lpss_platform_info spt_i2c_info = { >   .clk_rate = 120000000, > - .pset = &spt_i2c_pset, > + .properties = spt_i2c_properties, >  }; >   >  static struct property_entry uart_properties[] = { > @@ -87,14 +83,10 @@ static struct property_entry uart_properties[] = > { >   { }, >  }; >   > -static struct property_set uart_pset = { > - .properties = uart_properties, > -}; > - >  static const struct intel_lpss_platform_info spt_uart_info = { >   .clk_rate = 120000000, >   .clk_con_id = "baudclk", > - .pset = &uart_pset, > + .properties = uart_properties, >  }; >   >  static const struct intel_lpss_platform_info bxt_info = { > @@ -104,7 +96,7 @@ static const struct intel_lpss_platform_info > bxt_info = { >  static const struct intel_lpss_platform_info bxt_uart_info = { >   .clk_rate = 100000000, >   .clk_con_id = "baudclk", > - .pset = &uart_pset, > + .properties = uart_properties, >  }; >   >  static const struct intel_lpss_platform_info bxt_i2c_info = { > diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c > index 1bbbe87..6352aab 100644 > --- a/drivers/mfd/intel-lpss.c > +++ b/drivers/mfd/intel-lpss.c > @@ -407,7 +407,7 @@ int intel_lpss_probe(struct device *dev, >   if (ret) >   return ret; >   > - lpss->cell->pset = info->pset; > + lpss->cell->properties = info->properties; >   >   intel_lpss_init_dev(lpss); >   > diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h > index 0dcea9e..d064973 100644 > --- a/drivers/mfd/intel-lpss.h > +++ b/drivers/mfd/intel-lpss.h > @@ -23,7 +23,7 @@ struct intel_lpss_platform_info { >   int irq; >   unsigned long clk_rate; >   const char *clk_con_id; > - struct property_set *pset; > + struct property_entry *properties; >  }; >   >  int intel_lpss_probe(struct device *dev, > diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c > index 88bd1b1..fc1c1fc 100644 > --- a/drivers/mfd/mfd-core.c > +++ b/drivers/mfd/mfd-core.c > @@ -193,8 +193,8 @@ static int mfd_add_device(struct device *parent, > int id, >   goto fail_alias; >   } >   > - if (cell->pset) { > - ret = platform_device_add_properties(pdev, cell- > >pset); > + if (cell->properties) { > + ret = platform_device_add_properties(pdev, cell- > >properties); >   if (ret) >   goto fail_alias; >   } > diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h > index 1a5a87f..ba9d79f 100644 > --- a/include/linux/mfd/core.h > +++ b/include/linux/mfd/core.h > @@ -73,7 +73,7 @@ struct mfd_cell { >   size_t pdata_size; >   >   /* device properties passed to the sub devices drivers */ > - const struct property_set *pset; > + struct property_entry *properties; >   >   /* >    * Device Tree compatible string > diff --git a/include/linux/platform_device.h > b/include/linux/platform_device.h > index 03b7555..66dca60 100644 > --- a/include/linux/platform_device.h > +++ b/include/linux/platform_device.h > @@ -73,7 +73,7 @@ struct platform_device_info { >   size_t size_data; >   u64 dma_mask; >   > - const struct property_set *pset; > + struct property_entry *properties; >  }; >  extern struct platform_device *platform_device_register_full( >   const struct platform_device_info *pdevinfo); > @@ -172,7 +172,7 @@ extern int platform_device_add_resources(struct > platform_device *pdev, >  extern int platform_device_add_data(struct platform_device *pdev, >       const void *data, size_t size); >  extern int platform_device_add_properties(struct platform_device > *pdev, > -   const struct property_set > *pset); > +   struct property_entry > *properties); >  extern int platform_device_add(struct platform_device *pdev); >  extern void platform_device_del(struct platform_device *pdev); >  extern void platform_device_put(struct platform_device *pdev); > diff --git a/include/linux/property.h b/include/linux/property.h > index b51fcd3..ecab11e 100644 > --- a/include/linux/property.h > +++ b/include/linux/property.h > @@ -238,18 +238,9 @@ struct property_entry { >   .name = _name_, \ >  } >   > -/** > - * struct property_set - Collection of "built-in" device properties. > - * @fwnode: Handle to be pointed to by the fwnode field of struct > device. > - * @properties: Array of properties terminated with a null entry. > - */ > -struct property_set { > - struct fwnode_handle fwnode; > - struct property_entry *properties; > -}; > - > -int device_add_property_set(struct device *dev, const struct > property_set *pset); > -void device_remove_property_set(struct device *dev); > +int device_add_properties(struct device *dev, > +   struct property_entry *properties); > +void device_remove_properties(struct device *dev); >   >  bool device_dma_supported(struct device *dev); >   -- Andy Shevchenko Intel Finland Oy