mirror of
https://github.com/hardkernel/linux.git
synced 2026-03-25 12:00:22 +09:00
Revert "spi: Introduce spi_get_device_match_data() helper"
This reverts commitbd1be85dbbwhich is commitaea672d054upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: Ie546cd9f1f866e47de6283675c1093960f44c54f Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -335,18 +335,6 @@ const struct spi_device_id *spi_get_device_id(const struct spi_device *sdev)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(spi_get_device_id);
|
||||
|
||||
const void *spi_get_device_match_data(const struct spi_device *sdev)
|
||||
{
|
||||
const void *match;
|
||||
|
||||
match = device_get_match_data(&sdev->dev);
|
||||
if (match)
|
||||
return match;
|
||||
|
||||
return (const void *)spi_get_device_id(sdev)->driver_data;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(spi_get_device_match_data);
|
||||
|
||||
static int spi_match_device(struct device *dev, struct device_driver *drv)
|
||||
{
|
||||
const struct spi_device *spi = to_spi_device(dev);
|
||||
|
||||
@@ -1514,9 +1514,6 @@ extern void spi_unregister_device(struct spi_device *spi);
|
||||
extern const struct spi_device_id *
|
||||
spi_get_device_id(const struct spi_device *sdev);
|
||||
|
||||
extern const void *
|
||||
spi_get_device_match_data(const struct spi_device *sdev);
|
||||
|
||||
static inline bool
|
||||
spi_transfer_is_last(struct spi_controller *ctlr, struct spi_transfer *xfer)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user