You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
86 lines
3.0 KiB
Diff
86 lines
3.0 KiB
Diff
From c7b1e04ae4f47323800ca2b3d3430ecf1d9ed7df Mon Sep 17 00:00:00 2001
|
|
From: Stuart Yoder <stuart.yoder@nxp.com>
|
|
Date: Wed, 22 Jun 2016 16:40:44 -0500
|
|
Subject: [PATCH 181/226] 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: Stuart Yoder <stuart.yoder@nxp.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/fsl-mc/bus/dprc-driver.c | 2 +-
|
|
drivers/staging/fsl-mc/bus/mc-allocator.c | 2 +-
|
|
drivers/staging/fsl-mc/bus/mc-bus.c | 2 +-
|
|
drivers/staging/fsl-mc/include/mc.h | 10 +++-------
|
|
4 files changed, 6 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/staging/fsl-mc/bus/dprc-driver.c
|
|
+++ b/drivers/staging/fsl-mc/bus/dprc-driver.c
|
|
@@ -805,7 +805,7 @@ static int dprc_remove(struct fsl_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"},
|
|
--- a/drivers/staging/fsl-mc/bus/mc-allocator.c
|
|
+++ b/drivers/staging/fsl-mc/bus/mc-allocator.c
|
|
@@ -717,7 +717,7 @@ static int fsl_mc_allocator_remove(struc
|
|
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",
|
|
--- a/drivers/staging/fsl-mc/bus/mc-bus.c
|
|
+++ b/drivers/staging/fsl-mc/bus/mc-bus.c
|
|
@@ -36,7 +36,7 @@ static bool fsl_mc_is_root_dprc(struct d
|
|
*/
|
|
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;
|
|
--- a/drivers/staging/fsl-mc/include/mc.h
|
|
+++ b/drivers/staging/fsl-mc/include/mc.h
|
|
@@ -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;
|
|
};
|
|
|
|
/**
|