From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753122AbcF2PVS (ORCPT ); Wed, 29 Jun 2016 11:21:18 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34346 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752741AbcF2PU6 (ORCPT ); Wed, 29 Jun 2016 11:20:58 -0400 Subject: Re: [PATCH 03/11] staging: fsl-mc: clean up the device id struct To: Stuart Yoder , gregkh@linuxfoundation.org References: <1466631652-25731-1-git-send-email-stuart.yoder@nxp.com> <1466631652-25731-4-git-send-email-stuart.yoder@nxp.com> Cc: devel@driverdev.osuosl.org, agraf@suse.de, arnd@arndb.de, german.rivera@nxp.com, linux-kernel@vger.kernel.org, leoyang.li@nxp.com Newsgroups: gmane.linux.drivers.driver-project.devel,gmane.linux.kernel From: Matthias Brugger Message-ID: <5773E327.8000800@gmail.com> Date: Wed, 29 Jun 2016 17:03:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 In-Reply-To: <1466631652-25731-4-git-send-email-stuart.yoder@nxp.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 22/06/16 23:40, Stuart Yoder wrote: > -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 > --- > 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(-) > Reviewed-by: Matthias Brugger > diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c > index 7fc4717..f865d18 100644 > --- 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_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"}, > diff --git a/drivers/staging/fsl-mc/bus/mc-allocator.c b/drivers/staging/fsl-mc/bus/mc-allocator.c > index fb08f22..e59d850 100644 > --- 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(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", > diff --git a/drivers/staging/fsl-mc/bus/mc-bus.c b/drivers/staging/fsl-mc/bus/mc-bus.c > index cf92a1c..e975adc 100644 > --- 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 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; > diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h > index ac7c1ce..bc0d45c 100644 > --- 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; > }; > > /** >