shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "spi: Introduce spi_get_device_match_data() helper"

Browse Source 
This reverts commit bd1be85dbb which is
commit aea672d054 upstream.

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:
Greg Kroah-Hartman
2024-01-12 15:47:18 +00:00
parent 049200ae06
commit 88efb6da37
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/spi/spi.c
View File

@@ -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); 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) static int spi_match_device(struct device *dev, struct device_driver *drv)
{ {
const struct spi_device *spi = to_spi_device(dev); const struct spi_device *spi = to_spi_device(dev);

3
include/linux/spi/spi.h
View File

@@ -1514,9 +1514,6 @@ extern void spi_unregister_device(struct spi_device *spi);
extern const struct spi_device_id * extern const struct spi_device_id *
spi_get_device_id(const struct spi_device *sdev); 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 static inline bool
spi_transfer_is_last(struct spi_controller *ctlr, struct spi_transfer *xfer) spi_transfer_is_last(struct spi_controller *ctlr, struct spi_transfer *xfer)
{ {