From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751211AbdEaK7b (ORCPT ); Wed, 31 May 2017 06:59:31 -0400 Received: from mail-co1nam03on0055.outbound.protection.outlook.com ([104.47.40.55]:50711 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751056AbdEaK71 (ORCPT ); Wed, 31 May 2017 06:59:27 -0400 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; From: To: , CC: , , , , , , , , , , , Laurentiu Tudor Subject: [PATCH 03/10] staging: fsl-mc: simplify couple of deallocations Date: Wed, 31 May 2017 13:58:45 +0300 Message-ID: <20170531105852.22304-4-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170531105852.22304-1-laurentiu.tudor@nxp.com> References: <20170531105852.22304-1-laurentiu.tudor@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131407019606433360;(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)(336005)(39410400002)(39380400002)(39850400002)(39400400002)(39860400002)(39450400003)(39840400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(2906002)(5660300001)(97736004)(5003940100001)(7416002)(305945005)(498600001)(189998001)(2876002)(106466001)(105606002)(1076002)(104016004)(77096006)(33646002)(53936002)(76176999)(2950100002)(48376002)(38730400002)(50986999)(6666003)(50466002)(4326008)(47776003)(54906002)(86152003)(8656002)(356003)(36756003)(85426001)(50226002)(81166006)(86362001)(39060400002)(8676002)(8936002);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR03MB2574;H:az84smr01.freescale.net;FPR:;SPF:Fail;MLV:ovrnspm;A:1;MX:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD045;1:5PQtcF9aD2qes/jd5Ag1kg6GvKhHofX7QZXgsVJt+WMbCtCIWfaoyQgVdh3K+1wLIbOYt1h+EMJBTIQbdfP+xLV3FrXqcjmsUsdfz/Ug7V6JDV95zOZFmtLMDtZri7MBeRTMznykKJzUh7eOyrjP6bTPOILRXG5jWijUPvu3vdW9mQGCZWh6a9YXPYZ8TkgrFbsl8+pyASO2cnno5qrx2/AGt45Cc6ELaXn8xc39Q54nC9qVLO72L2kwtspYz62eFMBRNlv7qj8gsN19fE8UR2ZzJ7JEVwe3H1LkxvActDdTHXxau3IA8ftnnehmdpDjBRVmL4amE08UBVOAodmSr3zMkZEg5ox3DRdibOmF8ucJmQ4VxgGbBFucFJg0pF6+NMkC4ZTmfxN3BzVbybk231cV42aFpX6opOpfPqKMtJebPbndK/+SWQWpYghmFagdZ4PmUT3T9aLUIYDPzk+DKJpLkDLTIX/f9R821lO4cgdloJXo6ES8dH+ENuyyGSuVEr0GaUdpyezdADaju1jNw09MrX3gtS4S/kWGHQJHKovOp0xZuJaJi4n44X9khw2SgX/xe7cz4F2oxq8FOeQgsrOfns0wuMBXTjLzR7Z+TElIBRkCbTm/uNykNQHDqn+x2arr99RndElzT+5JS+1eGfKgY/wb8Lr1+R4DakPZha8= MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR03MB2574: X-MS-Office365-Filtering-Correlation-Id: 03dbff37-be36-40fe-fcf1-08d4a8141716 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131430075)(201703131517081);SRVR:MWHPR03MB2574; X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB2574;3:rZVV2AJhuJNJqfyR7UBjxGybh86BVCD5q1Bkpv9Gc7hfg/Fa6PKLDQWcNlQ8PmS9iuIeOLOBSBDRPhEH3Y10TjrliXJYT1eI2HH++pRWEpuVmv38gNJbAA6v8P0ewZGs8+be8Nq9ZMnZ26q9u/GQWBmzoh13QYHRlRgJsrqdGfGORAZxxWGgFWf2NwVxTbQKPAiLn2pM5TpDhP9cQex5RyLzhyEKawPFDeGNs4MOmvGy9R1e2MX0Nzag7Tf0kDCHX7XpLli/QKcTFSjf44b3VOfGYqvZdyvbKn7hX1Ob4F615VhYRLusUW0KNZY7FQMkPE9jpzsYv3f12xAgBQ+YVCUWU3YDfpRQa3yjK7BMuIwk/u530m5e5tZ9rP0GZ2dMSC9qy/iiRXHr5s2J2fEMdzoUrKlAu0M+yxiWd8akTT3tRJ5jbMq6P5vePZgFYapy;25:xGOwfVtl1AW9IE659K+iW1KwII4tNCkpXCrbTAMtEdrtSWeXrc1kTRkE1gxKB4qqoYohh2IWIbVQXk1/OBUD4SFlZIPep/T8U84nB+efE25H20vp6zlbH2st2FTnFOyNJwegNjpA9l+dMv4x+fe6DxcjSf2OB9CfmhB0aRfZj40pEve+b81F2XiZ5dHSdEjp5Ukl1X0tzx0Y56LM4MMbmxa116lxxbRv7v00ch7kFJOoSWIOpmaC9XPERneMpSzFjv1PcPdikO6N18spX4Jqb9tZ2RbSBBVH/XWb93w6CSz8vwi33lYTicpB2LIfjBY9LtANjwPTJ0ESuf9IWpRx1xbRH2/6kEH/f9SOF9OTBRzaj8AjSJPlUVuuE8h9TSKvsZ70c9nUVTpTMM9Cm8mw0vABdYeixRbT+mNPB7rMSmxRa7OfX8YBvqwsiIzFUgZta/aazEzUXXWIR7YJ/PLQ0rjKkeszCrEhT8ODuu8uiSs= X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB2574;31:Aq+no83EWBv8etMvPJyfu1F6UZDTUVzG31NcrdBTsPOhnc9bLjkGriGCGrOPGYuBLGy5IKeeVgtO9Jvj4gGcB0NARUHVot88xo4O0ILZTHuaq1t/2YrkvEe9xTc3Cs+JkWP9xTcsyISvphrrKiJDrxWRDjGa+XHRwZxTWiFUg9863NjW0AH67qjYUQS5q5p2Q4RhNFKKDkY0gdaZpcd36EphaBbHN8g+fFe7hwsiZeBfZAcQKqysiCXzD5LxErSM95tSbQBkJ2RrAQxD7v513c3d3lxgW9NgzcAuHi1iYLM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6095135)(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(6055026)(6096035)(20161123559100)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123561025)(20161123565025)(20161123556025)(20161123563025);SRVR:MWHPR03MB2574;BCL:0;PCL:0;RULEID:(400006);SRVR:MWHPR03MB2574; X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB2574;4:LYgzY7fNuKfXqZlQX30n1cDbgd7sHqCecqdub8E1yItkO+Q7SP4z9NuRdQIa3bzOMwoenzW31LWNJT/BJn2uGOnRjF7cpLVDqwBxsmNOWIgUvwGWyXeMKVkmGXn5DYVs4hCJNdHxBsEO0jxWdZgzMqMJcfiCFlfGvb7eu3zyQi+HvrD+pOdeCBzgc+bcBaHPa3NKUsoSDlkwziXf8nxWgqXm5OND2PQLgBnwAVbASh8r+lIzsmBpK9FWBKyTyYLCHcep55ql7kYVXV/PRhUOYj2wkGiTNowqR/Gg+5wzg3HQMBkXRyb1LADXVQwtryUBBQNYlXrdlluwKDzIVlQZnkG7Kc9ugAt//gy2UfDJVAoXQ9tVPxmoG3i5x+Zjakqm52OmGqpKmAH+FfRFUfcA68O3f3VAWisnSWQr34HM3ffiwpwltCPeG3PXWaIk2WYsB9UXUNQ9KIdQHY4QViT7beqnKu8F6ay4u0Dmkjiyt7zqoP94dSSMnXufNh5whSy5GckdccWnvpuIAAYm8Ev1mxvNUj6YEes6LqompkIeEUw12R6GHa7woX5y7QQPr88jy2S2/vC7lZqJviO9iQaRTlWCKkNBDpGCEnHBAkezg7afvzd5+F2Q2eqPCNXXqMlo49NJYFgmRUoO2cZDr45t1kEadIL2+GmRirTE0pg+DbyMbmXOJ/mAGkWxw4s0Y604PDlx5UcjZcB6K+UyxreTgAz93lkzjS9r6QAcMZaFAK+Eom/vNtTMCyBJTldUAlxHXLJetO6Ry29JVkeAirkbOcFGz0mdFACVs+6RXbQEL3EH5OE5UXrcOHObzzHb5K8J7dU4tQPJWBM6XlWQn1FKLoQUG1CSdRzQQQSKCn+NUZPF7Rqyzj7hwKseD6uu6xeccqJew71EAgkhvtF211ApRg== X-Forefront-PRVS: 0324C2C0E2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR03MB2574;23:ClLemOFOHxgKaE8qBmxjLg7kKjpFTAeYNMOXJPwdI?= =?us-ascii?Q?e7McseQAouy2uGFg65E6+IVTAtR+LoJLeTQn+P9BJyaSNNfS11gQAc+Kbv8f?= =?us-ascii?Q?hg5/VJ/oobuFb50j0MZKHwy3phdCPdxZbATF3BJmyTH1xPAKXwRGiJp3EkiM?= =?us-ascii?Q?5ILBHDcNLU+FkaFyPITaeDoIjtNOXqKLRB+IiiFqjDCw6oLYAvnNWPS7ZAXZ?= =?us-ascii?Q?0vkAK+n2Drdcp2DlKOfVVbvMgrjuQlHMoxDPXt+VXuUCO9C41eQjmqIt4FtQ?= =?us-ascii?Q?ZU5Gv/57M5ltHiB4Ce8horhxdSqqW7FkEQLz7CVQRO/Z9Xh7B6IOKpKL5hxi?= =?us-ascii?Q?iN54x+3k0/7AHpzaDsYNKNYyy1vSM5hRIV0W0JEi8sKieOLHi4eLQuK+EQWv?= =?us-ascii?Q?+etM9YRo3k6jh4DszFAa7ItpPjki9YriDs9yjpYAKLgFiUhAL4ENfNXH1MV4?= =?us-ascii?Q?s1SZ4Zea318JkS32FS3trexozJergyas9ikAfGObxTtX0hZduGItSHSYXQqN?= =?us-ascii?Q?YV9liE+xw9+aKxaAjm7ozY0a8thv2n2iIC3R5qv5paJsemJvV9j695JaYUd/?= =?us-ascii?Q?aD1ovk0tVbnSNchZ0w8JoRuwsFkuUzioZm66CGnD+hJiAI51Fqe+TmPWEAUP?= =?us-ascii?Q?cGPYoZPvG62DYkLw3iVjkT2R7ILRmpkbezlJHrFOgc7qiV5rSdXFiUN4nSyS?= =?us-ascii?Q?YHqJsAo+Oj7DY0gKPM/2Tpz5xho8QfdljNmnJNQ7lz+t/d7fdhc0erA39Ssr?= =?us-ascii?Q?XTwCenOco7iR0wYW/XyqeWxNvaX1Us3KEBGXROPviZv6NO/sJ2fu0PZJ4wAY?= =?us-ascii?Q?YrEOQCYZfsxYNIxVU16hxe+xT9n5t5k6D4wAUsC3fIbgv0b+kwo3lgBCsguV?= =?us-ascii?Q?fB0YJkUWmMUhEsgK1rI03MtypBIb0sS7weIXzB78aVcKXsxqlgSe4vhZL6C/?= =?us-ascii?Q?DLnxcQ0AwnlOPGR2n3je/mpM7DvzhHr/TsWN1IlZxjenLtJpucN+uzywgQgc?= =?us-ascii?Q?XPPrclOtvvMBOTuRzU+mYoQNvBaw/OfimM/s4+9/PoSAmb/ojI5n3AkMCLhV?= =?us-ascii?Q?kYboy1Qnk2MhtUHrQa4UeGtlgznYcNfnZ2+mfi1ETGD3o72gTbtLOOHhskTy?= =?us-ascii?Q?UPU48aEU8uWPAKNCaMaKmEmF7+++EmwIkCHHDAZaS+G+hcumE70jX5S6xvbJ?= =?us-ascii?Q?JH8E3RTLMU/TAidzP2eBLMqHypKd8PuOJeheHXyGL0WwGqHf+KAeUscTWuA2?= =?us-ascii?Q?bcZ+yRWfUvR+zzJipAglXT+Znq8TovxFKZataYA/osFE5xT49OPmSB2gWmmg?= =?us-ascii?Q?Vo0lb7QuPtKEnd0ixiwAe0=3D?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB2574;6:aT71gztIXfbyajZtT994NY1zF2Uo+xiAFRUsVIT9g2A0Sc+AURpTEw8uPNbmIXpp9IDpqFNaMvr7jJj/WvkjxnX7hJGKm2DnfrjrHDMrXRfyCwdtSN2HvSjf+72VlnuOgCM5oSNp0joaKt0XfQx7f+1CiHC0wJG3E2htsyaWCgPNZArl1ebrRopbv0I7vgi4kHgMgJlY0wig8eR5E8t0jD4r6DFEMajtmQcN9T40Knfu4ghYDLyOXU4Y5klrTk+lSlSSGqt+d86seAVpXF3IKfShOEEHRA+BR/GpU8jnGEE5XArs361obY5vzeJjqv1kF2bdfpIPlV9EUTKEumpCnGKSIGy3Hke/Km9kEvpxP1I0sctqPxgFrhe3jfqRsx0r21nExe7TJPZ9kTSDct3GGol5HmKUxx71V5NEUq/8ZSkND80Ivu8cmxbP8utsYy4P8Yzw56Gpl6JrQgkkCgzNGNT2HEyhFIJXzhMbDTOBI6SKmNT1hPPpXDrE6rtDzgG/kLhQPtYebPXZ2CTc8HoSTA==;5:mx8Zvp0AVqg0Uz40iKvtC4Mv1EjfxPBPO7kW1OrCRtKN/jjjfv/9LxowEsf9SSiLzF8RTGUOHOW44VRYOPDjRq9O20RhC/4Z4kYoisGpFvvudbuZ1wFocz5+jnQeiboqCL37WjlWpw4xrsdaYMwr9HOOqkCqJkmOoMRjKhAX+yYzjqAQRcN0Uxs5PdOE+s6C;24:0aU1Bn3kJtCKlry5H3h1IeFa1MIJ0ilHI1rcWaAz29ub44xj8ntDMMfWnO8cOjS6DLaWbUUg5icyp67Esb5b+42UNwnF8x0DShBxTkoF+7A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB2574;7:BuED7PgVQQZ74yDzKbU1k8cRzKaq1uJGZO+jzyjoph4EayDzgrNryX447uYsbXgEYUj4uaHOUUu+gswn2qWYft3p1X1ldGb5Oe9Ky3ADKLbs41FrYjLGD/4gn5/RsvpBSeWnju/otYCLgNHHpH0dM/W8GPW98huzK3G7/bCnCxAodd+QDvgdwhoGIVC8MyL0dVgyRVb32PhP9YbqiocWwMHohooPB4d7X6Yl8skEohYhy8omdpF6Az9X2vSnvnfFIeGcYrKifNAOUnYZ1dCIRw5aokPd+BI06vmPwKYrFXQ7rj+lroo+PlhRo8oFS88Dotjl0v+vthmeuQzgV8c43g== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2017 10:59:20.4561 (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: MWHPR03MB2574 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Laurentiu Tudor Simplify a couple of deallocations code paths. This also fixes these checkpatch.pl false positives: "WARNING: kfree(NULL) is safe and this check is probably not required" Signed-off-by: Laurentiu Tudor --- drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c index 50eb415..7b48ade 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c @@ -420,15 +420,11 @@ bool fsl_mc_is_root_dprc(struct device *dev) static void fsl_mc_device_release(struct device *dev) { struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); - struct fsl_mc_bus *mc_bus = NULL; kfree(mc_dev->regions); if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) - mc_bus = to_fsl_mc_bus(mc_dev); - - if (mc_bus) - kfree(mc_bus); + kfree(to_fsl_mc_bus(mc_dev)); else kfree(mc_dev); } @@ -559,10 +555,8 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, error_cleanup_dev: kfree(mc_dev->regions); - if (mc_bus) - kfree(mc_bus); - else - kfree(mc_dev); + kfree(mc_bus); + kfree(mc_dev); return error; } -- 2.9.4