From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751187AbcFVVo1 (ORCPT ); Wed, 22 Jun 2016 17:44:27 -0400 Received: from mail-by2on0067.outbound.protection.outlook.com ([207.46.100.67]:63924 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751026AbcFVVoZ (ORCPT ); Wed, 22 Jun 2016 17:44:25 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; From: Stuart Yoder To: CC: , , , , , , Stuart Yoder Subject: [PATCH 03/11] staging: fsl-mc: clean up the device id struct Date: Wed, 22 Jun 2016 16:40:44 -0500 Message-ID: <1466631652-25731-4-git-send-email-stuart.yoder@nxp.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1466631652-25731-1-git-send-email-stuart.yoder@nxp.com> References: <1466631652-25731-1-git-send-email-stuart.yoder@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131111054555835979;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(8666005)(356003)(7846002)(48376002)(2906002)(4326007)(85426001)(97736004)(189998001)(19580395003)(19580405001)(50986999)(305945005)(76176999)(586003)(50466002)(33646002)(2351001)(36756003)(11100500001)(5003940100001)(229853001)(86362001)(68736007)(8676002)(87936001)(77096005)(575784001)(2950100001)(110136002)(81156014)(50226002)(104016004)(47776003)(81166006)(8936002)(6806005)(105606002)(92566002)(106466001)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0301MB1626;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD029;1:WUYfG9xWRgrfbR5vB1DP+Fntgvj5PwlYXXQIhLSIoqYqh5j78Ox4j3efH0HwszQmZC9JgsT0s02H5OXf8vB8vfBuaPh9Qb3l80mmlUOdSLGX90J2RhL11CyhyMkKwB64hxCDGU1W8rW66V+bWNUW9fCmDmOsKdHnF5/sv3QRfUtyA0ZChcyjZ8ZSJWBG1ChJ7OOEolShsAUsezyNgu0foiNuz3mMHdrYcRa4+Rmdcuqtls9FP0Jwq+GU11qoP4NqTD7Q7jf6Maltw3e7Vr4BZ/AmZ8sAP5NEMbiRVRmYR2DxEhFzcqsTYKN+bp+hKHts4Alafpza1raQBMPXoNMe49O0T42zvc/t6u9tabqFGvfxKItFYGvpccKRoUpXMhnYWJuiFcO2wLyf0s9dGdsYLbIKyv03Gpqp4cQgZaHkte6oLiTAoxPJb9TyR7rjWOb5WAdiZazjB0BtGAIezj6+fqb8KSJSyHDPQOU/1ps5TwD+VaQ+MrycN/Z/KXJKFhbhTViSbpl4VplgYp8nR5ojNIfitXkDfccAXbYbCJUC8I/6f76hNflcTruJ21i+KkqgcjkpffNeSLs+E4wFbIaolv5nPFdxYptCkMvSzqG6kqltzSllJEpag7PU1aUOImWij6qP3W/DA4M9Vfk1wMmgwrf9BnbYzBuwRux4M8swmeiAPZ/ERDhNDqfcUWkZgBDz MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 9756c538-6934-4692-0cea-08d39ae65b62 X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1626;2:CvbV/OLnduEhDRahvQMaYr0RJMnrrjShXSPPyLv9NOoa+CAUIE+B5S8Tozz/XAngg7OHcl9mqGn4twh562XjQq7y1ASEyf4zGMLIxAGJNrWTk5NLEJgakS8H/W4o8Rxt1lw5xmre3X6JZvHQcU0NXxjwBPUkouKrYGJSoNR8lkVd0tYuQHSjKfb/XP83zVhL;3:+qow/isiiQOgD1Dl64tlm5okyZshBnnmB8XFfkZeod4pxhUJcK6r4LGkTFj2pWHU4wEMtPB45GVXl0xyBNoxgzLfwTe90Cu+R6BKefFX4HXVegd9ZJS68wv4Sw6oCRggnVIPye0deBliwUA7DasqUlJqAfU3UMl8NNLiGgyjjsaTiiThNyDdMQD2nzm7cLp06z3ebSgHOWR2oeWQtG0m9O0WzNuOnsj7F1PeUf+RZHs=;25:97wINyLX0+FYVwsX1rTuNK7moIkniKzmOX4c97/v3r5Qar9G9xygwUqgqHOoHbWXFY5cihig6wBEyI2x3ttaYJ9i92sTL1516Vzsj28x3gJcZxOYOgS1kHE5NzGzW9DL/b70BqPpeqMbfYNfZYsEVcI/gAb1eVO7so3O0NIyoLSiFMPByKpF0YlhcT+hMajjLT0sNJhx5cgcRtJce7iFIzV/jUYiY0UYf4zsfmytbWvjBeLZPMKKbgt3CEcDVjMGm22dir4p5iVaqNdSVCYd6OOAPtjxVt0TKLB5fD1fpX85tlhSY4KfAdLNeFHME/S1T/7HpQG2Eh2DlTK38+nAHUITRoclNBXNoZqyWv6I4vufyC77D5PLbVX7G2r3COLz9L3VcNnQxB/jHYHzccEBTAOZe4weSZ3x/W7xjKfgH8s= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1626; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13018025)(13017025)(13024025)(13023025)(13015025)(5005006)(8121501046)(10201501046)(3002001)(6055026);SRVR:CY1PR0301MB1626;BCL:0;PCL:0;RULEID:(400006);SRVR:CY1PR0301MB1626; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1626;4:FZexBmtT3HJJJsJVRlvueBrw+FUWps8PErb48CwDBzVkzkC8ILOR+a5d4vJfmViOanh0QrdvrLy8Fobk3zteTBzYEYLkSIZ2qeHnTxmX8vr7njmRKXE3d4RduuS8HNsvOXOMJwXTfsY8Wcsma/G9dHKwPTHQWcpk4o4Pnj4hlgDvuU2wm85C4aQxS2irBvQarpbGtl4VbXOITX5Ws/aJIuEgAc/4oeCciUAxh/np4JpQ9h5qdb38gK+i5ZzwYJvOgVvDa85PUFAa7tUXMUX6UM9ZyyV3cUKFExmht4mcwdqgWGGroh/Gp+/WvuBD2yzar+MiS13MSeNzMm7RShyYeAecrqI5wqE5BRssgNuoIiYfLZYDIz9qJe3Z6gV9hHxU5gd28lRqkKh1YYWRWQwGaq2TX4eBhEr7xEEBxI+S9Up26rvY/YlaMUKslSdyLHEHiwf5SwkJbnOiNgDy7cs2U4J/O0uocMcq+AIf5MdWxIN/qowuEJ8R2yX+bPV8ZC69tkVysw5P790qtZ4FuW+MXg== X-Forefront-PRVS: 0981815F2F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0301MB1626;23:GAQxQXch1vHjUbcqPWTkOVTLuibLoGkF8RjllmP?= =?us-ascii?Q?RWCPLcmCi6hGs4SVOHqbsGjqKxCFxifH9YR1cTkbUh80EviiJT/efCtjFyHd?= =?us-ascii?Q?0BY1DL82cuGwL75KI9yuAhQBjCo6HFHujBPX0v5V7dK2JXsKCRX9kxYFBBtu?= =?us-ascii?Q?ZcZI7PF8P6oc1NJtrzoUHpkLd31/tCgytHl9BPSkXsjj82LiZeTVtYAd5bCg?= =?us-ascii?Q?rbTEwG4iOg4DGGeAXTjMPsCeNcqjl3OYxmnNaVHB1cCyuVtMMIkHl4mq9qFC?= =?us-ascii?Q?lf1ZGxUhDD6ghsSFtoJUgQDXmermJfLCM7+HLsx8INb4lWOpNL1VEL7NoYDi?= =?us-ascii?Q?RfhafDuXlTw2dFRafrONdG9jPpGJGB42fj6tq59hYRiNQmneVMbKxbZPrXdM?= =?us-ascii?Q?AusZf9qUGT6NkfMbAsw4nc82wAhY6hFdqXUuJfGtce/x44w7IamZBMxYEvVn?= =?us-ascii?Q?cTZzve6hJ6c0zOwWOO4nVRzVbYE1G0NmkI3G65HSgKFHmnuzz0VR9tnlGyoi?= =?us-ascii?Q?SGVGS7SZK05L0f0QMxSC7XmV7wjbUuE6SR93nUZmDv3k0dd8a9C7mKNehtrj?= =?us-ascii?Q?pClq5weoAvIpmrmDKzUORVr+0alYTTtou/UyJejMnComlNr/RcCe4HYMSjGq?= =?us-ascii?Q?KISTx2RBFPda7BgRiuvldR+l9lkHea01Yi1IPctjodwjp/rixkzhH5uVmPsW?= =?us-ascii?Q?+q6zh8X5Hd2Ds7uRUhW0HuZDwByd64kn/HwMMEzoa6wVdl/HXxrGkeLvc6Ag?= =?us-ascii?Q?2tap/XXGxWYz/v8h8IBTcCTatkRUmtS5YzK62/UIg40dYIwmJnsRgWrsh419?= =?us-ascii?Q?Udv7zUFPPUuI2ED0C+spiiOWsRdD8xa6X5VzQZnxbHchSSc6lkgwW9wajFFs?= =?us-ascii?Q?3Qw+xuDnmbfJKODNLbeCI9vQ571EayXVF7DumyLmWEHFEGXSvHP/XJb/xvop?= =?us-ascii?Q?AOsxl9KkRJ/7g7ZzTcrrfFJCB2vIr2A/1eFDO4+yNP27+qo1l73gum+lJDKG?= =?us-ascii?Q?GYXLF/4xRX7ChApGKg3fTR2ZaZyyqMp6e4KsiKzfmTrii5yQhUXh6c3Csu2R?= =?us-ascii?Q?/qxKO9eAci0b72LVle7dhSNzQXk8PSClLY9yZgTOx0+rbua+C9bGm31md8LX?= =?us-ascii?Q?EcR1YqVQgaeyNT7Xojh40UCJ9Z8T7jV5LvTY2ASKdYl0PgPQdU3MTyCoUE+v?= =?us-ascii?Q?mjmATnatsU66g8Fw=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1626;6:kJnTUjGw5AKzfaRmJvNLf14wpCVsrCV5m/gbwddFaLaio/MJhlY8oqJkwv8m7Cx0ajXxJ73mCZ6lNQzGJpSRq0V1pIENz2IS6eYD0ivMHVac5ydHTARnHkGKRKugQBnlFWtSwegmKN7vSl9qgjr2s2z0gSP8t5b1oqxXYfJypAQzfmlt25rLgYb0ht/XsUrgsHQN5AJA7ZXNKunsnYPEnfU1no4BzYs0Mi7LS8gjcxnUTr0c+ogro4KngIfvox5axffO6JrVjS5LXSU+N0szkTCR73kww/p/gSvOKOqnYyJPrU0D82bcqHgnUdRoc1Tf;5:qF8Ylqy0JYNzJxHINWzsiTH0AFwHANUx2Rxz6gKEJOJMLXNs9fk2I4WMF+J34VmU/RkfGJY4rWSW+gFQDckToOfPDqXjECSC/JkAo2bu1zphwQkszuGAmzsMaQ4Lua6OG9gqAxXo9aOt8d5+LU/krt7XDhf3iAZ3rldLxqIxbcU=;24:twFH/6nxhEgPs02PmYKq4vBw7IneLn2Efdi1q4mNQ7syvrOe3nwdzCZaHugeQ1682CymVo3qL/KaeuX2QEfmTgmtcYUz0LgFNkE+Xdwia+g=;7:5+7c2w9BWyFP8Q+UK034342TmtTlh4NIt2n95mmjEiGdG1FvM/rI3alGw7zjUVbFtmNNM0I/SV0Sr3y9+m7vuAY/stf9wrnQr2Xehj0GJ4xQvQh2UFt4+OEA0rDAXsQxfttbOiChnKkCPa9pawZqHfHVuWU4ChQLLABfWbv6zeECMKGUKHqxY1P3O3C2wo8vkpqahYibOC+u3zQTg2zVMDcSp7YdbS/3JyfZoW9snqhVUEe5yrqwZb30SbSFmR90M4K79eRmQjIcA6YY2c/FMQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2016 21:44:15.3963 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1626 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org -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(-) 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; }; /** -- 1.9.0