|
@@ -554,11 +554,9 @@ done:
|
|
EXPORT_SYMBOL_GPL(spi_register_master);
|
|
EXPORT_SYMBOL_GPL(spi_register_master);
|
|
|
|
|
|
|
|
|
|
-static int __unregister(struct device *dev, void *master_dev)
|
|
|
|
|
|
+static int __unregister(struct device *dev, void *null)
|
|
{
|
|
{
|
|
- /* note: before about 2.6.14-rc1 this would corrupt memory: */
|
|
|
|
- if (dev != master_dev)
|
|
|
|
- spi_unregister_device(to_spi_device(dev));
|
|
|
|
|
|
+ spi_unregister_device(to_spi_device(dev));
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -576,8 +574,7 @@ void spi_unregister_master(struct spi_master *master)
|
|
{
|
|
{
|
|
int dummy;
|
|
int dummy;
|
|
|
|
|
|
- dummy = device_for_each_child(master->dev.parent, &master->dev,
|
|
|
|
- __unregister);
|
|
|
|
|
|
+ dummy = device_for_each_child(&master->dev, NULL, __unregister);
|
|
device_unregister(&master->dev);
|
|
device_unregister(&master->dev);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(spi_unregister_master);
|
|
EXPORT_SYMBOL_GPL(spi_unregister_master);
|