Commit c21d322e authored by Eddie James's avatar Eddie James Committed by Joel Stanley
Browse files

fsi: Use of_match_table for bus matching if specified 



Since we have two scom drivers, use the standard of matching if
the driver specifies a table so that the right devices go to the
right driver.

Signed-off-by: default avatarEddie James <eajames@linux.ibm.com>
Link: https://lore.kernel.org/r/20230612195657.245125-4-eajames@linux.ibm.com


Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
parent 21930d80

drivers/fsi/fsi-core.c

+9 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/slab.h>

#include <linux/bitops.h>

#include <linux/cdev.h>
@@ -1354,8 +1355,14 @@ static int fsi_bus_match(struct device *dev, struct device_driver *drv) 
		if (id->engine_type != fsi_dev->engine_type)

			continue;

		if (id->version == FSI_VERSION_ANY ||

				id->version == fsi_dev->version)

		    id->version == fsi_dev->version) {

			if (drv->of_match_table) {

				if (of_driver_match_device(dev, drv))

					return 1;

			} else {

				return 1;

			}

		}

	}



	return 0;

drivers/fsi/fsi-scom.c

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/cdev.h>

#include <linux/delay.h>

#include <linux/fs.h>

#include <linux/mod_devicetable.h>

#include <linux/uaccess.h>

#include <linux/slab.h>

#include <linux/list.h>
@@ -587,6 +588,12 @@ static int scom_remove(struct device *dev) 
	return 0;

}



static const struct of_device_id scom_of_ids[] = {

	{ .compatible = "ibm,fsi2pib" },

	{ }

};

MODULE_DEVICE_TABLE(of, scom_of_ids);



static const struct fsi_device_id scom_ids[] = {

	{

		.engine_type = FSI_ENGID_SCOM,
@@ -600,6 +607,7 @@ static struct fsi_driver scom_drv = { 
	.drv = {

		.name = "scom",

		.bus = &fsi_bus_type,

		.of_match_table = scom_of_ids,

		.probe = scom_probe,

		.remove = scom_remove,

	}