1 From c7b1e04ae4f47323800ca2b3d3430ecf1d9ed7df Mon Sep 17 00:00:00 2001
2 From: Stuart Yoder <stuart.yoder@nxp.com>
3 Date: Wed, 22 Jun 2016 16:40:44 -0500
4 Subject: [PATCH 181/226] staging: fsl-mc: clean up the device id struct
6 -rename the struct used for fsl-mc device ids to be more
7 consistent with other busses
8 -remove the now obsolete and unused version fields
10 Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
11 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
13 drivers/staging/fsl-mc/bus/dprc-driver.c | 2 +-
14 drivers/staging/fsl-mc/bus/mc-allocator.c | 2 +-
15 drivers/staging/fsl-mc/bus/mc-bus.c | 2 +-
16 drivers/staging/fsl-mc/include/mc.h | 10 +++-------
17 4 files changed, 6 insertions(+), 10 deletions(-)
19 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c
20 +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c
21 @@ -805,7 +805,7 @@ static int dprc_remove(struct fsl_mc_dev
25 -static const struct fsl_mc_device_match_id match_id_table[] = {
26 +static const struct fsl_mc_device_id match_id_table[] = {
28 .vendor = FSL_MC_VENDOR_FREESCALE,
30 --- a/drivers/staging/fsl-mc/bus/mc-allocator.c
31 +++ b/drivers/staging/fsl-mc/bus/mc-allocator.c
32 @@ -717,7 +717,7 @@ static int fsl_mc_allocator_remove(struc
36 -static const struct fsl_mc_device_match_id match_id_table[] = {
37 +static const struct fsl_mc_device_id match_id_table[] = {
39 .vendor = FSL_MC_VENDOR_FREESCALE,
41 --- a/drivers/staging/fsl-mc/bus/mc-bus.c
42 +++ b/drivers/staging/fsl-mc/bus/mc-bus.c
43 @@ -36,7 +36,7 @@ static bool fsl_mc_is_root_dprc(struct d
45 static int fsl_mc_bus_match(struct device *dev, struct device_driver *drv)
47 - const struct fsl_mc_device_match_id *id;
48 + const struct fsl_mc_device_id *id;
49 struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
50 struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(drv);
52 --- a/drivers/staging/fsl-mc/include/mc.h
53 +++ b/drivers/staging/fsl-mc/include/mc.h
54 @@ -39,7 +39,7 @@ struct fsl_mc_bus;
56 struct fsl_mc_driver {
57 struct device_driver driver;
58 - const struct fsl_mc_device_match_id *match_id_table;
59 + const struct fsl_mc_device_id *match_id_table;
60 int (*probe)(struct fsl_mc_device *dev);
61 int (*remove)(struct fsl_mc_device *dev);
62 void (*shutdown)(struct fsl_mc_device *dev);
63 @@ -51,20 +51,16 @@ struct fsl_mc_driver {
64 container_of(_drv, struct fsl_mc_driver, driver)
67 - * struct fsl_mc_device_match_id - MC object device Id entry for driver matching
68 + * struct fsl_mc_device_id - MC object device Id entry for driver matching
70 * @obj_type: MC object type
71 - * @ver_major: MC object version major number
72 - * @ver_minor: MC object version minor number
74 * Type of entries in the "device Id" table for MC object devices supported by
75 * a MC object device driver. The last entry of the table has vendor set to 0x0
77 -struct fsl_mc_device_match_id {
78 +struct fsl_mc_device_id {
80 const char obj_type[16];