diff mbox

[V3,2/4] ACPI / bus: introduce acpi_device_get_match_data() function

Message ID 1510281175-27173-2-git-send-email-okaya@codeaurora.org (mailing list archive)
State New, archived
Headers show

Commit Message

Sinan Kaya Nov. 10, 2017, 2:32 a.m. UTC
OF has of_device_get_match_data() function to extract driver specific data
structure. Add a similar function for ACPI.

Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
 drivers/acpi/bus.c   | 12 ++++++++++++
 include/linux/acpi.h |  6 ++++++
 2 files changed, 18 insertions(+)

Comments

Sinan Kaya Nov. 10, 2017, 2:35 a.m. UTC | #1
+linux-acpi@vger.kernel.org, +Rafael

On 11/9/2017 9:32 PM, Sinan Kaya wrote:
> OF has of_device_get_match_data() function to extract driver specific data
> structure. Add a similar function for ACPI.
> 
> Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
> ---
>  drivers/acpi/bus.c   | 12 ++++++++++++
>  include/linux/acpi.h |  6 ++++++
>  2 files changed, 18 insertions(+)
> 
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index 4d0979e..da29c10 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
>  }
>  EXPORT_SYMBOL_GPL(acpi_match_device);
>  
> +void *acpi_device_get_match_data(const struct device *dev)
> +{
> +	const struct acpi_device_id *match;
> +
> +	match = acpi_match_device(dev->driver->acpi_match_table, dev);
> +	if (!match)
> +		return NULL;
> +
> +	return (void *)match->driver_data;
> +}
> +EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
> +
>  int acpi_match_device_ids(struct acpi_device *device,
>  			  const struct acpi_device_id *ids)
>  {
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index 502af53..62c85a5 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -584,6 +584,7 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),
>  const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
>  					       const struct device *dev);
>  
> +void *acpi_device_get_match_data(const struct device *dev);
>  extern bool acpi_driver_match_device(struct device *dev,
>  				     const struct device_driver *drv);
>  int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
> @@ -755,6 +756,11 @@ static inline const struct acpi_device_id *acpi_match_device(
>  	return NULL;
>  }
>  
> +static inline void *acpi_device_get_match_data(const struct device *dev)
> +{
> +	return NULL;
> +}
> +
>  static inline bool acpi_driver_match_device(struct device *dev,
>  					    const struct device_driver *drv)
>  {
>
Rafael J. Wysocki Nov. 12, 2017, 12:14 a.m. UTC | #2
On Friday, November 10, 2017 3:35:41 AM CET Sinan Kaya wrote:
> +linux-acpi@vger.kernel.org, +Rafael

Thanks!

> On 11/9/2017 9:32 PM, Sinan Kaya wrote:
> > OF has of_device_get_match_data() function to extract driver specific data
> > structure. Add a similar function for ACPI.
> > 
> > Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
> > ---
> >  drivers/acpi/bus.c   | 12 ++++++++++++
> >  include/linux/acpi.h |  6 ++++++
> >  2 files changed, 18 insertions(+)
> > 
> > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> > index 4d0979e..da29c10 100644
> > --- a/drivers/acpi/bus.c
> > +++ b/drivers/acpi/bus.c
> > @@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
> >  }
> >  EXPORT_SYMBOL_GPL(acpi_match_device);
> >  
> > +void *acpi_device_get_match_data(const struct device *dev)
> > +{
> > +	const struct acpi_device_id *match;
> > +
> > +	match = acpi_match_device(dev->driver->acpi_match_table, dev);
> > +	if (!match)
> > +		return NULL;
> > +
> > +	return (void *)match->driver_data;
> > +}
> > +EXPORT_SYMBOL_GPL(acpi_device_get_match_data);

While I understand that the name follows the OF convention, I have some
doubts on whether it is the best one.

Apart from this the change is fine by me.

Thanks,
Rafael
Vinod Koul Nov. 29, 2017, 1:55 p.m. UTC | #3
On Sun, Nov 12, 2017 at 01:14:12AM +0100, Rafael J. Wysocki wrote:
> On Friday, November 10, 2017 3:35:41 AM CET Sinan Kaya wrote:
> > +linux-acpi@vger.kernel.org, +Rafael
> 
> Thanks!
> 
> > On 11/9/2017 9:32 PM, Sinan Kaya wrote:
> > > OF has of_device_get_match_data() function to extract driver specific data
> > > structure. Add a similar function for ACPI.
> > > 
> > > Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
> > > ---
> > >  drivers/acpi/bus.c   | 12 ++++++++++++
> > >  include/linux/acpi.h |  6 ++++++
> > >  2 files changed, 18 insertions(+)
> > > 
> > > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> > > index 4d0979e..da29c10 100644
> > > --- a/drivers/acpi/bus.c
> > > +++ b/drivers/acpi/bus.c
> > > @@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
> > >  }
> > >  EXPORT_SYMBOL_GPL(acpi_match_device);
> > >  
> > > +void *acpi_device_get_match_data(const struct device *dev)
> > > +{
> > > +	const struct acpi_device_id *match;
> > > +
> > > +	match = acpi_match_device(dev->driver->acpi_match_table, dev);
> > > +	if (!match)
> > > +		return NULL;
> > > +
> > > +	return (void *)match->driver_data;
> > > +}
> > > +EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
> 
> While I understand that the name follows the OF convention, I have some
> doubts on whether it is the best one.

Perhpas acpi_get_match_data() ?
Sinan Kaya Nov. 29, 2017, 8:49 p.m. UTC | #4
On 11/29/2017 8:55 AM, Vinod Koul wrote:
>> While I understand that the name follows the OF convention, I have some
>> doubts on whether it is the best one.
> Perhpas acpi_get_match_data() ?

Will change as recommended unless Rafael has a better idea.
diff mbox

Patch

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 4d0979e..da29c10 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -785,6 +785,18 @@  const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
 }
 EXPORT_SYMBOL_GPL(acpi_match_device);
 
+void *acpi_device_get_match_data(const struct device *dev)
+{
+	const struct acpi_device_id *match;
+
+	match = acpi_match_device(dev->driver->acpi_match_table, dev);
+	if (!match)
+		return NULL;
+
+	return (void *)match->driver_data;
+}
+EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
+
 int acpi_match_device_ids(struct acpi_device *device,
 			  const struct acpi_device_id *ids)
 {
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 502af53..62c85a5 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -584,6 +584,7 @@  extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),
 const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
 					       const struct device *dev);
 
+void *acpi_device_get_match_data(const struct device *dev);
 extern bool acpi_driver_match_device(struct device *dev,
 				     const struct device_driver *drv);
 int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
@@ -755,6 +756,11 @@  static inline const struct acpi_device_id *acpi_match_device(
 	return NULL;
 }
 
+static inline void *acpi_device_get_match_data(const struct device *dev)
+{
+	return NULL;
+}
+
 static inline bool acpi_driver_match_device(struct device *dev,
 					    const struct device_driver *drv)
 {