target/linux/layerscape/patches-4.4/7181-staging-fsl-mc-clean-up-the-device-id-struct.patch

   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
   5
   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
   9
  10 Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
  11 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  12 ---
  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(-)
  18
  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
  22         return 0;
  23  }
  24
  25 -static const struct fsl_mc_device_match_id match_id_table[] = {
  26 +static const struct fsl_mc_device_id match_id_table[] = {
  27         {
  28          .vendor = FSL_MC_VENDOR_FREESCALE,
  29          .obj_type = "dprc"},
  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
  33         return 0;
  34  }
  35
  36 -static const struct fsl_mc_device_match_id match_id_table[] = {
  37 +static const struct fsl_mc_device_id match_id_table[] = {
  38         {
  39          .vendor = FSL_MC_VENDOR_FREESCALE,
  40          .obj_type = "dpbp",
  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
  44   */
  45  static int fsl_mc_bus_match(struct device *dev, struct device_driver *drv)
  46  {
  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);
  51         bool found = false;
  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;
  55   */
  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)
  65
  66  /**
  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
  69   * @vendor: vendor ID
  70   * @obj_type: MC object type
  71 - * @ver_major: MC object version major number
  72 - * @ver_minor: MC object version minor number
  73   *
  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
  76   */
  77 -struct fsl_mc_device_match_id {
  78 +struct fsl_mc_device_id {
  79         u16 vendor;
  80         const char obj_type[16];
  81 -       u32 ver_major;
  82 -       u32 ver_minor;
  83  };
  84
  85  /**