Message ID | 1479307230-16650-11-git-send-email-claudiu.manoil@nxp.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Scott Wood |
Headers | show
Return-Path: <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tJnMs6Jpkz9t0w for <patchwork-incoming@ozlabs.org>; Thu, 17 Nov 2016 01:54:17 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tJnMs5Sj7zDw4c for <patchwork-incoming@ozlabs.org>; Thu, 17 Nov 2016 01:54:17 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0043.outbound.protection.outlook.com [104.47.36.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tJn4Q36sGzDvYD for <linuxppc-dev@lists.ozlabs.org>; Thu, 17 Nov 2016 01:40:54 +1100 (AEDT) Received: from BN6PR03CA0024.namprd03.prod.outlook.com (10.168.230.162) by DM2PR0301MB0751.namprd03.prod.outlook.com (10.160.97.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.734.8; Wed, 16 Nov 2016 14:40:49 +0000 Received: from BN1AFFO11FD018.protection.gbl (2a01:111:f400:7c10::142) by BN6PR03CA0024.outlook.office365.com (2603:10b6:404:23::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.721.10 via Frontend Transport; Wed, 16 Nov 2016 14:40:48 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD018.mail.protection.outlook.com (10.58.52.78) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.721.5 via Frontend Transport; Wed, 16 Nov 2016 14:40:48 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:721; Count:10 Received: from fsr-fed1764-016.ea.freescale.net (fsr-fed1764-016.ea.freescale.net [10.171.81.161]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uAGEeVKd005542; Wed, 16 Nov 2016 07:40:46 -0700 From: Claudiu Manoil <claudiu.manoil@nxp.com> To: <linuxppc-dev@lists.ozlabs.org> Subject: [PATCH 10/17] soc/qman: Remove redundant checks from qman_create_cgr() Date: Wed, 16 Nov 2016 16:40:23 +0200 Message-ID: <1479307230-16650-11-git-send-email-claudiu.manoil@nxp.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1479307230-16650-1-git-send-email-claudiu.manoil@nxp.com> References: <1479307230-16650-1-git-send-email-claudiu.manoil@nxp.com> X-IncomingHeaderCount: 10 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131237808490016209; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(336004)(189002)(199003)(33646002)(2351001)(50466002)(48376002)(106466001)(105606002)(50226002)(104016004)(8936002)(47776003)(86362001)(50986999)(68736007)(2906002)(189998001)(5003940100001)(4720700003)(7846002)(36756003)(81156014)(97736004)(305945005)(8676002)(76176999)(4326007)(356003)(8666005)(5660300001)(81166006)(69596002)(85426001)(2950100002)(92566002)(6916009)(626004)(110136003)(77096005)(87936001)(6666003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0751; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD018; 1:7cc4iJmmBz55Ozc80ECWprSaRAWckJ9n3waL5w4w1lFxyT+0bZ/U8HaMlJK3zoPhESy9z5dR2NgyTv/oLqJM0iIodZsrHtTc+Pw/nddEb51KOKoLBRADpUFb/Ybz1kT4rTUF9D5C9dmTBtwv2n/Qzm12P6/mym2uJUsK7/KCJr1VbVwKGnj16UYxVRzK5Wbbz6GuRW8vPFEPVagr6E1uyCFoJj2iFFtS8eLz/HmSkq0JojqG+F4b0egoKeRj22lB0vcH6bwnSfTpVwpWjO6I70UDRqgUT6gA9zfwvHpC6t8nPvPbYcfb1nqhotu8Ui4LjizN3rLF6lF3Hxsue02LLeCn0MRSQ3n/cZAOeqLScMZJdyNz0s6E6JE8XjSTtTJiDqrG3uQ9q99Z64CXVbWdekxmf50QlyaWeLmnw17/zKOU7/SVogipwybtdQWEkzdjGsW+cyfYyC+ciPuWgny1m9eSTegN2R4xscPpcoRR004Kt/xe1sRkUCeioCqvvAv3gOw90sw1uOxs+fjXNby5rsK+1CKVcxiL6wTWchZL9J11YQGRHBz+VhKplgAADlIXm3i34glNAXjVpx8HpbMo1ZoCkJhPKd5PzUw4mKSqkQtbjKZunIfLnJU3QCrijea2detWkDzikUylxr4l276Mf10vVt5SN9kkt68ipoQHDAmivH5vX1Jfm/EaaChRMiZbNZXzkT59JaYzCld4AGjZEjg7wE5a3Tc4dIUZ2pEmAZg= MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 2:y7j13iGRfcGbu8dOvwiNdgI7h8+DLq0E7PQt+zhkDG/opOKLDEx0gPGwGp1NJUhV7krMUeFD9t9CcYnKturQZ5Vo2F+2oci9ak2K+SJMqnlJxpSi5SDbPK0ZCH06DKgwZ9Nsi9SumBd4/PufKfgNeish+oU4EI+ZlwZQJ4993QI=; 3:Cc/tnwDQ3KyHS1iW2LrOPam4GVse5ZB6cyDKd2ipmVKqAc+dg64UpyoBCYAMTtGGFfX/5Rc5yIfBqPn/2CeWoUxt+ee+c2U7dkwiwz72zwuFG1mQQbhXTwzuf2XTPndOYirUSCdtPEm23k5id0FoUhO3l6dODhQFNLcM12tyX2CT+U8srmSVHSH6FdTaIO6imKDREgtnmE4+XUgGhkd3yUZ1r8z5BU7xch4RtEotGPAF5IH6a/xa5gFE/L4vx0oN0liOGifXA7sFCLOSYO5XFA==; 25:1cdVAuTXYwcEkPfvbnxazVk1Chu9A2VJlKLyR64wTKkGCEXjil5WhrgCDFKVZiNSm0Z6Tu2PzKexlUOmQzvPikVji2u3vK1/+spXbWlNVAAJ2qsw0URShRbCP3lc0aF7EPzh7hzL0uw69MhFozWdGauc7vHEglcHeZ4G14Vt06B7VKCan493yWm1x3U9hyhDiCgrsS3btFUSs4/tDMEM7j9j0McjKIc9l1drpZzXUDf1DjRFc13hGI3+WU/qrjTtCO9g4rPNOEcsp0YIs0y5z259RE1GFutDMwVwkplb2vhMDmvzgkwjwbFhZc35QNQBm32zXJC9xhABgqI2JT4lCo1Uxy7EauAn7eoEIwyHRJRhxBLN4SQcQws6FbvXOX4lS4DcYY+nzjoXYbX5D71DVlARb1tcn+Spdbym+TZvfJOAxVJLn9cwlbjalC8641kU57685bNhCUiTLwlpIUEDZw== X-MS-Office365-Filtering-Correlation-Id: 6f8158a3-d6f9-4e27-8c70-08d40e2e8e9a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0751; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 31:HGXufmQee6bXUSRRQSHHKM+Qy8ovtMFL4Wk7TzTMe2YAlgaH42K7X2h2pTmE2A2tKgjv8HlZtyNBopsBTwJnlazKfVkArCKi3LkVFoxfZUKRD5rJVvmu7NPH+V5qOSVw3gjqS1m7wa7sPE1+G8juyBU/CsSbw2O7hYdoZ5djTwkUwU9qb0YGXhUGQWL2xXHSDDOnR7zjSiO3JOi+6Qj/baKLxryU2l9BvqX/3MNER0cbhujVpMLtLnWI7ZnuVc6dIFX+qWnYUm06JKtElDF4ZA== X-Microsoft-Antispam-PRVS: <DM2PR0301MB07517D8ED322A73A87642E1A96BE0@DM2PR0301MB0751.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684)(17755550239193); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095035)(601004)(2401047)(13023025)(13017025)(13018025)(8121501046)(13015025)(5005006)(13024025)(10201501046)(3002001)(6055026)(6096035); SRVR:DM2PR0301MB0751; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0751; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 4:++xc4SeZiHkSVRv86aADrM73eVfYV/FrcqXkvAAGLjFVGEWJTv4sUSnl5LYe5NIQKvoD30XgSZtPGkkFKMx7wprgSnRCA3WHrcp48P0kcn73a+4Z6o2zjI5USobFHyu1jPmrPlON3DTfhAVv5K1aTYmTl/phU9cdFqRPyjEg5OkC1P/h92nF9dxvMIMOpNCWvm/Uv0GL7m/TMSzHyprDT4fwrdo8LKG+LqKmk0HecAzfQmDYla2M0kEHYiqagpxL1ZEg1uTrIyOrPEpkO5WwPaoxBPbSpH5qCZfMlU9dCqMkOT8GYPl+TndKCQoFIji71uUXCeAZLZzra7ssYwrLryo9m+Q85BZEx6omnea/E3bt9Co3hvzrIa1SfoBTq73h3B6izeYNI7RR9DDgDUXg4OVAophbTnhTbXmo9ClBJoC9+Skn0NF6hNfbeWS/3QZzPjO6BEC82VExxlPE6WjGSnueFti9hVEt61nlls/pEM+BLPwAckzKH+LnMc+1zAmhJQcSls9J0XqCOtjd35NZdWNU8V+WmROt9tWmMYkBTtqouJulqyK6Zdx7mYbfG9Wr+tntj77RmQ7Pt/229BejvhNYzkQ8byQchIAxFGmlt1CazHyvhwV7asW5aRuCWlYMW8BNyHJGkjopaWs7SiKg3Q== X-Forefront-PRVS: 01283822F8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0751; 23:ntTRL0a0pSw9WUkbNryMOdX+RnYpl7QW2N4Fukq?= =?us-ascii?Q?xOmZNBOlw4VxtOoTQctrrTIMZLMNtd1RFKuxJ8bRX3EyC+tBRwMc1PIDoNrG?= =?us-ascii?Q?58Ut+Kj5ccaFCWRUoxbL6DK+TFvvHF/55Lz5lgEWkWWk8RMf1lth6FYTLXJ4?= =?us-ascii?Q?QEsoljtZeV/jCIJpqcFmwEJBB+TmysdNgsJYCHDOnbuEK7MzAPgTFV3daHkZ?= =?us-ascii?Q?xBinwmMYxL/f0dA3DHYcIt6z0ZDpPo6GpDvGwFdHOyJpcQD2PEz+YxsSPCKx?= =?us-ascii?Q?2/fQCVuNQiKjTUWGEOkpqSLwHa5LNHFB9UUwncY5JEpj8pSg7DY7/UF+eTsY?= =?us-ascii?Q?KB9j+q83QY+Jp9qmNWjULNVGvojRKAe0UCI3UFFNAQjapP/1GqKXW079raXC?= =?us-ascii?Q?eZXReQyD/MdtQ4LwVydnQ7mzPOl0JZ5HXLbfge52jOVE/eK3Fz18tSiuTRos?= =?us-ascii?Q?QpcCDFJm7AQVnBX6yTpmbQ18mUqRLT+U3/kjDdIUCiZVAf/2q/OES/B66d5n?= =?us-ascii?Q?G8XhkQBhoBExYIkolltfBAXmuWiKFF8xpku/FR87cqwwC5gVo5QNuNwFD1Zb?= =?us-ascii?Q?s7/KQpChuNs5KNz6HuwI3Uzidd85vovEB351gq1XHHa/lKrOmmOpvtTwk52H?= =?us-ascii?Q?0T5zotSLd1esyDjy3wmgP+ZogdCFx0r7xuQWSWZTxQReXfav4jA3LXgZSLbz?= =?us-ascii?Q?qG92sn4mTy2W6Lxz6ulo++Sbh2rC/kGq6cJSe8lR2hRgOKg0UqjF066v9MsS?= =?us-ascii?Q?RP6xM1PtssolxLmHhgtO4YAJ6QAJejmlDjgJkNrY/7fbQeqjBtf7Z4NigoWB?= =?us-ascii?Q?ojMzqxXE09JxcF17uNw+0yvyIXNjl+skbCGXG4J3XKuqgNq6YmV/4Oh4i4EO?= =?us-ascii?Q?9aRQuSyyoGJ0vXYBQ4GtdMyJMi/ziLDECBSnJGFzbIxrRwqPEETP3K3nNtpb?= =?us-ascii?Q?UMEWHZUL+UKdLP3CCnDVEF5OjppGGOrFQTlWwGxASpZ/3FtJ+F4FcKyaV1KT?= =?us-ascii?Q?D3C9fdMf6QHoaIjPdO6E8WRWBfikJ8HRdVmXruxUMaCySZoK2NAXh5X3dLz4?= =?us-ascii?Q?isIoxDHijhJ9tF1bafeosoPDbZLtaglfBzs0WrbsVqODvE2k/TiJ0fTsgLpz?= =?us-ascii?Q?k8DB052NSi0xVvugBHPI/U9zzmLAHeqvo1Qtk6JN7fRhg5XxVDHgf3Q=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 6:akEhfpG2FkIeDy3sgQZIiYBQ5dkMk+iFBn1DAtqZJWfQzKAcx9heULhxjjVyepmqBgO6JbZr7kJ3Fyzo8x2RSNy3zvzaSI/B21TGTE53n/NBBizRPA3dHdHdwp9/XYlg7YGnRAh04EF8yjTY14S/vFN4II6YeQzk7//42SPQwsgMMlxObaLSveD9tuMEXjiIvS+Mn+gPW8bfNGKU1KG2yo7Lu9+vVRUXBxH96uLQzu9i1R7BD1ep8R3gGayOo988/MVytH/qbyrYqKcq18rcIgJyMNPDhJSuzHw+2SJY8B/myKqS1sAv/qrRTCSOnX4zhsm7XFDb+y65aURL4oEoag==; 5:ckOr32Zu8hL537PWwVCIg3JhKfr24etnAtYb99CIpUWuMoqKeHYq6y5JxorLJ+gHdZ2cpo1wNBzAjQSPsdXdnEQSzRGe2OY1kM8269yzVR1qEs7oqE3OlRZVqqCe5LeuCCgSpKDFgjuxpim0IkmAMPZOLT/fNBI+RRvAvVnuoZbVY3Vc2GVawPCzYqm0QD8H; 24:p6nVS8Y3eSo3VGNkWPHFMkUJwNU2eBE2q9s1toNNt809NAkTnL0Nx5DzkBjd6YaocDDcqm2FxVwMSxYbF1Eff0aC3TnT/0Jw9oAzAVcfxdk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 7:acWnbO8q72YHbiifHnuDiMWy0z7KhZuU0CzRKFwqiGYC13bHTO7L/HBgQvo1UnEzVFnK26+Sc+dztGVHh/R5ygUduVDpJsh7TXqUKqqUT6Wp6AKSuao18S3J4F3HL3ZXi4ci5ivPAPNwOc33DwDIEhRg/QaglCeoYdygWMZwIOQuQxDga+A1pMsqtyi4UfoUWqjfV9kKzFG2qigJVsZgmMlfDO3UUo0TCJ8Q/AAYiHQ8UhD2xbuIobf6vcTXkVqhP3zPbJr4JSvkQuPH53jdNk1tLzcmz0AMJKOUg5GlXvexjK7hnTXM3RICgq88JgBXzczh485KTiNCFX5ODbvyszOiRi9wD38X+ellgMg7JEo= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2016 14:40:48.7676 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0751 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org> List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>, <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe> List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev/> List-Post: <mailto:linuxppc-dev@lists.ozlabs.org> List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help> List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>, <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe> Cc: Scott Wood <oss@buserror.net>, roy.pledge@nxp.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org> |
diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c index 283c2d3..6715485 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -2294,7 +2294,6 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, struct qm_mcc_initcgr *opts) { struct qm_mcr_querycgr cgr_state; - struct qm_mcc_initcgr local_opts = {}; int ret; struct qman_portal *p; @@ -2316,11 +2315,12 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, spin_lock(&p->cgr_lock); if (opts) { + struct qm_mcc_initcgr local_opts = *opts; + ret = qman_query_cgr(cgr, &cgr_state); if (ret) goto out; - if (opts) - local_opts = *opts; + if ((qman_ip_rev & 0xFF00) >= QMAN_REV30) local_opts.cgr.cscn_targ_upd_ctrl = QM_CGR_TARG_UDP_CTRL_WRITE_BIT | PORTAL_IDX(p); @@ -2331,7 +2331,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, local_opts.we_mask |= QM_CGR_WE_CSCN_TARG; /* send init if flags indicate so */ - if (opts && (flags & QMAN_CGR_FLAG_USE_INIT)) + if (flags & QMAN_CGR_FLAG_USE_INIT) ret = qm_modify_cgr(cgr, QMAN_CGR_FLAG_USE_INIT, &local_opts); else
opts is checked redundantly. Move local_opts declaration inside its usage scope. Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> --- drivers/soc/fsl/qbman/qman.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)