Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57538afb authored by Stuart Yoder's avatar Stuart Yoder Committed by Greg Kroah-Hartman
Browse files

staging: fsl-mc: clean up the device id struct 



-rename the struct used for fsl-mc device ids to be more
 consistent with other busses
-remove the now obsolete and unused version fields

Signed-off-by: default avatarStuart Yoder <stuart.yoder@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d568b767

drivers/staging/fsl-mc/bus/dprc-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ static int dprc_remove(struct fsl_mc_device *mc_dev) 
	return 0;

}



static const struct fsl_mc_device_match_id match_id_table[] = {

static const struct fsl_mc_device_id match_id_table[] = {

	{

	 .vendor = FSL_MC_VENDOR_FREESCALE,

	 .obj_type = "dprc"},

drivers/staging/fsl-mc/bus/mc-allocator.c

+1 −1
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ static int fsl_mc_allocator_remove(struct fsl_mc_device *mc_dev) 
	return 0;

}



static const struct fsl_mc_device_match_id match_id_table[] = {

static const struct fsl_mc_device_id match_id_table[] = {

	{

	 .vendor = FSL_MC_VENDOR_FREESCALE,

	 .obj_type = "dpbp",

drivers/staging/fsl-mc/bus/mc-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static bool fsl_mc_is_root_dprc(struct device *dev); 
 */

static int fsl_mc_bus_match(struct device *dev, struct device_driver *drv)

{

	const struct fsl_mc_device_match_id *id;

	const struct fsl_mc_device_id *id;

	struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);

	struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(drv);

	bool found = false;

drivers/staging/fsl-mc/include/mc.h

+3 −7
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct fsl_mc_bus; 
 */

struct fsl_mc_driver {

	struct device_driver driver;

	const struct fsl_mc_device_match_id *match_id_table;

	const struct fsl_mc_device_id *match_id_table;

	int (*probe)(struct fsl_mc_device *dev);

	int (*remove)(struct fsl_mc_device *dev);

	void (*shutdown)(struct fsl_mc_device *dev);
@@ -51,20 +51,16 @@ struct fsl_mc_driver { 
	container_of(_drv, struct fsl_mc_driver, driver)



/**

 * struct fsl_mc_device_match_id - MC object device Id entry for driver matching

 * struct fsl_mc_device_id - MC object device Id entry for driver matching

 * @vendor: vendor ID

 * @obj_type: MC object type

 * @ver_major: MC object version major number

 * @ver_minor: MC object version minor number

 *

 * Type of entries in the "device Id" table for MC object devices supported by

 * a MC object device driver. The last entry of the table has vendor set to 0x0

 */

struct fsl_mc_device_match_id {

struct fsl_mc_device_id {

	u16 vendor;

	const char obj_type[16];

	u32 ver_major;

	u32 ver_minor;

};



/**