Commit c21b0837 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

spi: Use device_find_any_child() instead of custom approach 



We have already a helper to get the first child device, use it and
drop custom approach.

Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220610120219.18988-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 82b070be

drivers/spi/spi.c

+2 −7
Original line number Diff line number Diff line
@@ -2613,11 +2613,6 @@ int spi_slave_abort(struct spi_device *spi) 
}

EXPORT_SYMBOL_GPL(spi_slave_abort);



static int match_true(struct device *dev, void *data)

{

	return 1;

}



static ssize_t slave_show(struct device *dev, struct device_attribute *attr,

			  char *buf)

{
@@ -2625,7 +2620,7 @@ static ssize_t slave_show(struct device *dev, struct device_attribute *attr, 
						   dev);

	struct device *child;



	child = device_find_child(&ctlr->dev, NULL, match_true);

	child = device_find_any_child(&ctlr->dev);

	return sprintf(buf, "%s\n",

		       child ? to_spi_device(child)->modalias : NULL);

}
@@ -2644,7 +2639,7 @@ static ssize_t slave_store(struct device *dev, struct device_attribute *attr, 
	if (rc != 1 || !name[0])

		return -EINVAL;



	child = device_find_child(&ctlr->dev, NULL, match_true);

	child = device_find_any_child(&ctlr->dev);

	if (child) {

		/* Remove registered slave */

		device_unregister(child);