| Message ID | 20210212141121.62115-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [v2,1/5] ACPI: property: Remove dead code | expand |
On Fri, Feb 12, 2021 at 3:16 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > After the commit 3a7a2ab839ad couple of functions became a dead code. > Moreover, for all these years nobody used them. Remove. > > Fixes: 3a7a2ab839ad ("ACPI / property: Extend fwnode_property_* to data-only subnodes") > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Patches [1-4/5] from this series applied as 5.12 material and please see my comments for the last one sent separately. Thanks! > --- > drivers/acpi/property.c | 20 -------------------- > include/linux/acpi.h | 21 --------------------- > 2 files changed, 41 deletions(-) > > diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c > index 16b28084c1ca..22ccab4e7c6d 100644 > --- a/drivers/acpi/property.c > +++ b/drivers/acpi/property.c > @@ -841,20 +841,6 @@ static int acpi_data_prop_read_single(const struct acpi_device_data *data, > return ret; > } > > -int acpi_dev_prop_read_single(struct acpi_device *adev, const char *propname, > - enum dev_prop_type proptype, void *val) > -{ > - int ret; > - > - if (!adev || !val) > - return -EINVAL; > - > - ret = acpi_data_prop_read_single(&adev->data, propname, proptype, val); > - if (ret < 0 || proptype != ACPI_TYPE_STRING) > - return ret; > - return 0; > -} > - > static int acpi_copy_property_array_u8(const union acpi_object *items, u8 *val, > size_t nval) > { > @@ -995,12 +981,6 @@ static int acpi_data_prop_read(const struct acpi_device_data *data, > return ret; > } > > -int acpi_dev_prop_read(const struct acpi_device *adev, const char *propname, > - enum dev_prop_type proptype, void *val, size_t nval) > -{ > - return adev ? acpi_data_prop_read(&adev->data, propname, proptype, val, nval) : -EINVAL; > -} > - > /** > * acpi_node_prop_read - retrieve the value of an ACPI property with given name. > * @fwnode: Firmware node to get the property from. > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index ea296289a94c..14ac25165ae1 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -1121,14 +1121,9 @@ acpi_data_add_props(struct acpi_device_data *data, const guid_t *guid, > > int acpi_node_prop_get(const struct fwnode_handle *fwnode, const char *propname, > void **valptr); > -int acpi_dev_prop_read_single(struct acpi_device *adev, > - const char *propname, enum dev_prop_type proptype, > - void *val); > int acpi_node_prop_read(const struct fwnode_handle *fwnode, > const char *propname, enum dev_prop_type proptype, > void *val, size_t nval); > -int acpi_dev_prop_read(const struct acpi_device *adev, const char *propname, > - enum dev_prop_type proptype, void *val, size_t nval); > > struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode, > struct fwnode_handle *child); > @@ -1230,14 +1225,6 @@ static inline int acpi_node_prop_get(const struct fwnode_handle *fwnode, > return -ENXIO; > } > > -static inline int acpi_dev_prop_read_single(const struct acpi_device *adev, > - const char *propname, > - enum dev_prop_type proptype, > - void *val) > -{ > - return -ENXIO; > -} > - > static inline int acpi_node_prop_read(const struct fwnode_handle *fwnode, > const char *propname, > enum dev_prop_type proptype, > @@ -1246,14 +1233,6 @@ static inline int acpi_node_prop_read(const struct fwnode_handle *fwnode, > return -ENXIO; > } > > -static inline int acpi_dev_prop_read(const struct acpi_device *adev, > - const char *propname, > - enum dev_prop_type proptype, > - void *val, size_t nval) > -{ > - return -ENXIO; > -} > - > static inline struct fwnode_handle * > acpi_get_next_subnode(const struct fwnode_handle *fwnode, > struct fwnode_handle *child) > -- > 2.30.0 >
diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c index 16b28084c1ca..22ccab4e7c6d 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c @@ -841,20 +841,6 @@ static int acpi_data_prop_read_single(const struct acpi_device_data *data, return ret; } -int acpi_dev_prop_read_single(struct acpi_device *adev, const char *propname, - enum dev_prop_type proptype, void *val) -{ - int ret; - - if (!adev || !val) - return -EINVAL; - - ret = acpi_data_prop_read_single(&adev->data, propname, proptype, val); - if (ret < 0 || proptype != ACPI_TYPE_STRING) - return ret; - return 0; -} - static int acpi_copy_property_array_u8(const union acpi_object *items, u8 *val, size_t nval) { @@ -995,12 +981,6 @@ static int acpi_data_prop_read(const struct acpi_device_data *data, return ret; } -int acpi_dev_prop_read(const struct acpi_device *adev, const char *propname, - enum dev_prop_type proptype, void *val, size_t nval) -{ - return adev ? acpi_data_prop_read(&adev->data, propname, proptype, val, nval) : -EINVAL; -} - /** * acpi_node_prop_read - retrieve the value of an ACPI property with given name. * @fwnode: Firmware node to get the property from. diff --git a/include/linux/acpi.h b/include/linux/acpi.h index ea296289a94c..14ac25165ae1 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1121,14 +1121,9 @@ acpi_data_add_props(struct acpi_device_data *data, const guid_t *guid, int acpi_node_prop_get(const struct fwnode_handle *fwnode, const char *propname, void **valptr); -int acpi_dev_prop_read_single(struct acpi_device *adev, - const char *propname, enum dev_prop_type proptype, - void *val); int acpi_node_prop_read(const struct fwnode_handle *fwnode, const char *propname, enum dev_prop_type proptype, void *val, size_t nval); -int acpi_dev_prop_read(const struct acpi_device *adev, const char *propname, - enum dev_prop_type proptype, void *val, size_t nval); struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode, struct fwnode_handle *child); @@ -1230,14 +1225,6 @@ static inline int acpi_node_prop_get(const struct fwnode_handle *fwnode, return -ENXIO; } -static inline int acpi_dev_prop_read_single(const struct acpi_device *adev, - const char *propname, - enum dev_prop_type proptype, - void *val) -{ - return -ENXIO; -} - static inline int acpi_node_prop_read(const struct fwnode_handle *fwnode, const char *propname, enum dev_prop_type proptype, @@ -1246,14 +1233,6 @@ static inline int acpi_node_prop_read(const struct fwnode_handle *fwnode, return -ENXIO; } -static inline int acpi_dev_prop_read(const struct acpi_device *adev, - const char *propname, - enum dev_prop_type proptype, - void *val, size_t nval) -{ - return -ENXIO; -} - static inline struct fwnode_handle * acpi_get_next_subnode(const struct fwnode_handle *fwnode, struct fwnode_handle *child)
After the commit 3a7a2ab839ad couple of functions became a dead code. Moreover, for all these years nobody used them. Remove. Fixes: 3a7a2ab839ad ("ACPI / property: Extend fwnode_property_* to data-only subnodes") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/acpi/property.c | 20 -------------------- include/linux/acpi.h | 21 --------------------- 2 files changed, 41 deletions(-)