1 files changed, 23 insertions, 0 deletions

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 70845ccd85c3..8518a6eb63f3 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -59,9 +59,32 @@ static struct device_attribute spi_dev_attrs[] = {
  * and the sysfs version makes coldplug work too.
  */
 
+static const struct spi_device_id *spi_match_id(const struct spi_device_id *id,
+                                                const struct spi_device *sdev)
+{
+        while (id->name[0]) {
+                if (!strcmp(sdev->modalias, id->name))
+                        return id;
+                id++;
+        }
+        return NULL;
+}
+
+const struct spi_device_id *spi_get_device_id(const struct spi_device *sdev)
+{
+        const struct spi_driver *sdrv = to_spi_driver(sdev->dev.driver);
+
+        return spi_match_id(sdrv->id_table, sdev);
+}
+EXPORT_SYMBOL_GPL(spi_get_device_id);
+
 static int spi_match_device(struct device *dev, struct device_driver *drv)
 {
         const struct spi_device *spi = to_spi_device(dev);
+        const struct spi_driver *sdrv = to_spi_driver(drv);
+
+        if (sdrv->id_table)
+                return !!spi_match_id(sdrv->id_table, spi);
 
         return strcmp(spi->modalias, drv->name) == 0;
 }