Commit 38f3885e authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

ACPI: property: Remove dead code 



After the commit 3a7a2ab8 couple of functions became a dead code.
Moreover, for all these years nobody used them. Remove.

Fixes: 3a7a2ab8 ("ACPI / property: Extend fwnode_property_* to data-only subnodes")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e1e6bd29

drivers/acpi/property.c

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

include/linux/acpi.h

+0 −21
Original line number Diff line number Diff line
@@ -1114,14 +1114,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);
@@ -1223,14 +1218,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,
@@ -1239,14 +1226,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)