From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759436AbdEVMKC (ORCPT ); Mon, 22 May 2017 08:10:02 -0400 Received: from mail-sn1nam01on0047.outbound.protection.outlook.com ([104.47.32.47]:48680 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759359AbdEVMJv (ORCPT ); Mon, 22 May 2017 08:09:51 -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=fail action=none header.from=nxp.com; From: To: , CC: , , , , , , , , , , , Laurentiu Tudor Subject: [PATCH 1/5][v2] staging: fsl-mc: fix several checkpath.pl warnings Date: Mon, 22 May 2017 15:09:31 +0300 Message-ID: <20170522120935.4119-2-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170522120935.4119-1-laurentiu.tudor@nxp.com> References: <20170522120935.4119-1-laurentiu.tudor@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131399285889252024;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(979002)(6009001)(336005)(39400400002)(39850400002)(39380400002)(39840400002)(39860400002)(39450400003)(39410400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(9170700003)(6666003)(86152003)(8656002)(105606002)(2950100002)(86362001)(104016004)(106466001)(54906002)(77096006)(47776003)(33646002)(50986999)(76176999)(36756003)(5003940100001)(305945005)(498600001)(1076002)(85426001)(8676002)(81166006)(8936002)(50226002)(5660300001)(2906002)(356003)(4326008)(50466002)(2876002)(7416002)(189998001)(38730400002)(39060400002)(48376002)(53936002)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR0301MB0912;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:ovrnspm;MX:1;A:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD012;1:p6isNIqK8LgcIzEOpuyQMUygIvmruUddlxVX3ILSqbO6YbHk31yA0kfDExH3HbuK0BuyWzk6esuCWrbg4lruzFEtI2UB2khQCZX1LuF1S9uK8foH6uyIVEnxqvl+pLhW/VNjACOMJaszILpltbza1Zbau/yI7Dk82GfOFFJmqvWcFjlt0DWQDuYqzpYFIL9FQS11e9I50ZrVM6Gsqo/TxgP8DUHOF4vZ4a3EEwwnYa0aRpzitiViyDecXbNPebdzGhiXLonLPK+ZJVx32DsiFZ1j1v3wr9LItWZNzZ8r0GACg5vMJHXpS/lKwZxhf4U764mkldBcy9hMIkq7kQkxnn3XlkQyA43kwLadJ/nz9qMNfyA0xWGVbHCkwwv9y6eZZ2hWWZ3gIvzI9tZHoWCxTxktAbNNmDBApFEDdb2ExwBBTXrVontjwjXAEsCd2c5GSbuiHL7td0WUOitV7SsOMe2t+HbWYd4/O0lagSsfhcIuYXyEVIUHYaWGJDrudgC8nN2rfJqBldYICJ5kRn88YBFwTh0evoZP2mGg8wajVB+EL2b7O5TdTecci6KbLjyJDTit4Hy3rJhDeHPP9tkn42/OhX/wIGoMGsQ6YiIsZ61b3jNJR1z63jvemLIZWxz3gZmEEnQ7D1Hpvca0TrwqNosSRNVYwx1RKsw8kseoMVsJx3gK1fQmCAORilMaDS8VpCwO1EMfcr6y6KGKSKeCbHuJuhd0HAc6CzKV6JI7Ums= MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM2PR0301MB0912: X-MS-Office365-Filtering-Correlation-Id: b5cad2ce-1b54-49f0-3ab8-08d4a10b71a2 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131430075)(201703131517081);SRVR:DM2PR0301MB0912; X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0912;3:wqLwNO2OgtwvCDjUutAwNNxXt1cwvG/kHQbqpOE+k2mHdyM1xdEqooNIWMGXfFGxstqpD2AQIabo6ZwAhrY9wLDBUBFF4kwRRB/4NuZwKpOBbpHo7InEj6a2fpkqEdjsROim6VxthgNq2M6BwXz44m1zgiJKVXlMwG2mw/onckrto+k4jW/RoFm5imvqjsrawb9vSOG1rXYCGsgz96qMt3FA6Ukx4GKNy6LOsmrzBmG5WcEXMv7FWLU20TUyXxCMFqx8Bi+hArfUEVR9+AVbpKBRNnUM0LYpVqxf0Gtqt18akqgdAOFGMERP0uIk/0TLxDyl06RErTnoIBv69elpso1c7rE0He0jIvLx5X2U4YzQ+h6OPWYzoCYdEvoP7RR8U+4Sk7a5pATImRyAnVD3sYzl6asTaAvIaffRTTXQMh2uCtrrvYWz1DPKP13T7zxi;25:5ejYxVMi42I8+Cx2HKpTUBl1gsdrdV6BvXFQhTmwPkKQFIoMjroEIOyzb2EfnKTZuWhRRLzY766cT/KCk8cI9ITAQkeZdBiPQ8N1mbdgOGeLhbNV+sC9b2xJcgxsWWMJB4NwFBTrddD/aN4wzoSSLQY2QTiFyKGEiav0WGCDHgaJf8Yci1k3ijvywgFgkKRn34ztKgsGxpD5js0OnPQ7UbMXShNd4wLF/AthDSay7XBuMqFZhMPKmskeFyqBO8bOhGuMVSUAVbiyXByf/9jn8/CiB9bZn2X7gb2kJ+h9lZ3c70LerXUUkyV1slMVCQfuy7VdTwWe1EUhBuCCM+VMrhTp4in6N97jtbUPiuacGlVDAnmODgHbR9RRuj4HtiSQix6TO6IKfY4i9QlPAg9JXYhCpbRF8xohws/VXrOrrCumhauI3Th4k/+1b7SEwe5DXWU6/pE2gFN1WmyyqGAWaPquratYqG6aL1c3uL+aBSU= X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0912;31:du+0RStqQQqke2XgYu/Sw8LyZfEi8VtFtC6zfoP79E/hMkVBhQZOPFRtHT5X0KXROpbs6UFPjfnRIZUYItzpXj1cSQHKy30DOb3solv43QHLKaCDIpT2yvbzxqYLcnD5bWrQClVI6Qovr9Kjno3PtSi8iGFRhaqdPziYCTtmbT5auXMSOiZNRLAa+0aHFlxhnxKY4egI56OGFHIIMIgQlZmbUs5X4slPHnK0CcUwI08HKx/rZmvfILjnjhQsXsrVZe712uf0ZSEPocnZVf2iTQ== 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)(13017025)(5005006)(13015025)(8121501046)(13023025)(13024025)(13018025)(3002001)(10201501046)(93006095)(93001095)(6055026)(6096035)(20161123556025)(20161123559100)(20161123561025)(20161123563025)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123565025);SRVR:DM2PR0301MB0912;BCL:0;PCL:0;RULEID:(400006);SRVR:DM2PR0301MB0912; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR0301MB0912;4:QXmAJ0yefExm8X5BGDBf+StM1KdMnXbDJH/WaA96?= =?us-ascii?Q?S+EbXZqj/U+6MxVJqIZCrnuA4O3Ud8ZOL27BoDB1YEf7bAfW5LCDryvstJ18?= =?us-ascii?Q?7c97QzQCqJqjk7hrQdVWALLY0hcqzg9Qw77j4tKlSFR1Wu9aklLlX4QlvQOO?= =?us-ascii?Q?cCNFIBppX02S8msenFRfbDQnTcpFEWEzZ3gveASNzUGm0b8zIC0jcDAKw7IJ?= =?us-ascii?Q?NPJSism3SlH+t3GVbYTMOmli5nDeygBcv632jsmNLoyrKFmiKQgjkbMcADh4?= =?us-ascii?Q?Zw3IKPwF6v4xTJQptGwgIGod+nbEwQWLyISW6yK/SqsckaFJRZy4CuqGK0WV?= =?us-ascii?Q?8pVF9Gp29H+dJj0LcSCCf5A292byX3R/WmccxcVq7R6YaGz2aoNXQzljHdQR?= =?us-ascii?Q?Nt0+FwnmLDHpzn194d4wRb5A7iFWLwqx3p+IfcjHty5cWGCPMVS9Y3DxBq/f?= =?us-ascii?Q?DpH/DUqIamwjYsb8b5mu9ml/S9IXKQJh1vmyFWVbzwqd5/NzAUBaGjEXBXjE?= =?us-ascii?Q?KOASQ87uMtpchBA7N6GmZgoH4ROdhtIA/lk43YSwpvMXZEABy6OU6B8tx0Zn?= =?us-ascii?Q?nSRDt/6FL+j6glGDBPMouIq5RLLa1vV+Yupb/WZaUe2DIEWJ/frdmfCK8eBg?= =?us-ascii?Q?RAt/Fi9XRDiOiEgJrVxiP+21KwLCTmTuF/JcUpppmV9NYAStpM/W3ZcUnSAd?= =?us-ascii?Q?bfmjB8h7a+3hfSNVXqevRol93EGAdpJ5vJikqO/R6xPxoAYGitrbdYi4XYiX?= =?us-ascii?Q?JeV0zdUonCgEwdOnRDKRj1ISk1HpVwcyKRjkBPDRKYl/hbeNwKy2kKdNBGq8?= =?us-ascii?Q?5roBXg7tZVlMg/r1bPnl3GiYeE86I1Aty2L4Lyytdvh6OlTdyoic8E9WcWDt?= =?us-ascii?Q?zSUi+rWRCvs8TbhmqisMWBvquCoX8d+nUJ595dmMa+jJw8mvylTMwgAc7wb1?= =?us-ascii?Q?w94+nojhMrH3mvDCdkj8PsfeBfTKnT1JneXwlqHztQ=3D=3D?= X-Forefront-PRVS: 03152A99FF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR0301MB0912;23:uVRN3zFAMC52j7zwLxpYNOhkyKzJ+6HEX4VA4WU?= =?us-ascii?Q?AgakhIg6sKjsymp7vY6UtUN/LRfE6g1h8eUl6WrricJ8bXhmWQlQ13CwV5/O?= =?us-ascii?Q?aeCPN0zTv4Gb1ZZ2KxfTJeM1OBoDJpKxn7XPxXlsxqqNDY5dRPw8xPs+qHTW?= =?us-ascii?Q?MfMA4imnTmoSBxNUs/BnTdIoqsUaM3dqbsWlBgwoyc3clmyucy7lKfvz2uBf?= =?us-ascii?Q?fkgYgUnym6chsbQZlogtkHNH0qyFc4wyWKnUvjKgYaSsaUgV+IwOYusTJR0p?= =?us-ascii?Q?EWOry3ju4+/lYdM96JVFcx42/UiKKBsLOINj6FkTgqVWYOxF2t4ba7qqeBxm?= =?us-ascii?Q?dmcjlM1BMeam4NMUBO4LKGg3VUDrdBamuFtA/FNSlaLEnOlOjTt7ShW6Xddd?= =?us-ascii?Q?61ml42BtLAR2QhXo2UMfYZkU+2INTzNyrTq6/OYHIpsPBEpeZQHefv0T7Shn?= =?us-ascii?Q?HAoXCDVtYVOnNBhwBN8mlBF2jGA5qyJTwMHqOXR+xd41m5A8Frem3Wi8yOXw?= =?us-ascii?Q?bo1i6/S+xZbdYTyDYxSMHilpg5RzbfQwp+aDgQvBqAC+1Z+qTNmOPyayZbYs?= =?us-ascii?Q?wYqQhzeCCmKdjGk5ZoW7/zBPTH+Al+Kk/5QzOvNL+47w1pFQh0UJzazZK3e9?= =?us-ascii?Q?iCK+slDyE6iWfZGE55aGiLseWfj0axcbZIu2eq29TB8hfi1IVcOUh0+le7Jf?= =?us-ascii?Q?njjvTcOJ0OtlP2hfwJSBwQPEh2rtdLkdeTNZdip46N9wrAdtNZ/CfRRd3EoG?= =?us-ascii?Q?y/Z5XWHWZnAxm5taUnXY4xVaziolDxWJX9z5r3+mk6Ate/oCU9w+UwyJBSSi?= =?us-ascii?Q?fwjqJlZM/t5NnnGmv1AMl7vaucNefohmOpeftETzExvBR+tPJo0kUzWRucHJ?= =?us-ascii?Q?IFMp5KahlhQViEwkYvvw/ekqr+EngAQHseEFLWRktQ01f6im5ad0//riX/Va?= =?us-ascii?Q?g1ME+kSp/5luGbysFp4gA1su3DSkKAhHrB84+HY8jSwR5W4xQ8x2eh0Rn8VT?= =?us-ascii?Q?8TRh07v27024bOvQmvXJbuhnpLuL9vjYPwqDQ5SlUN9ENl6krrNQJRFELsKC?= =?us-ascii?Q?K8e5H2gS0P8eltj+ihBnH+YG4pci7FsxY+ynRzRqzLKX5vpxrNk7yzxQ3VfY?= =?us-ascii?Q?/bFtn3iXFJ5Is7iNr/UweYDSe3Ts4RLFp9k9/8GE0uMCPBIm+ckdWE1kHnWr?= =?us-ascii?Q?0Fy83/LQ0O613K4E7bBtOm0fTAD/WZgjhm8tGrJ6p70y4doEn/L8nRj/cHiq?= =?us-ascii?Q?ZVQoGPHFTj9ulq7o1hpcWaPtd4AWEuUX6cOqR/wFzUEsDgmOG70S1COF6yhK?= =?us-ascii?Q?3PM6JT6vgn5VujZvZ9qo2ReqMKYXQ7m/YRqoTqprfTkWQC8FAafbrj7s+MKm?= =?us-ascii?Q?/l0Ih3zbWTS+xey1rK5W4zPt5PCU=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0912;6:QMgXevbtFmfmomszC0jsSLtAkxGyGujeINcjOvT8WbCcxiwFE/0IuycBRZEN8469TG7IkRK08/R3diGztk+aqW+qjdz/AvHyM08iwLem/+GBU78YjY0sluoCZ9y4fb+nHBbob9rWfq/L+wgVAvZ/aDXySmBf9l7NqGx8gqXKlNQGNaFsA+HbIfFUieyVjBhGnV+U6sNPGsgtZ0/fD6NrkDYFp1/f+cutQvnCbQ+wfaICEqybRA7rLPBLDUEkYnaDaCz+aWNDagK8L1a7RS5Zx9aL08VNh4Z+kUZIZlpbUsDjs5qPiVojMuhBdwpsLCuuDIunV7OEgvvdMiSRIKbkJjuWIAXbRwlR6l1sg9y+KM5Pv57omyu21y0cPLybxSTVVKYbLVF/x0/F1GPKazQHd7QzUlX8Hvsh2JCdo+lJwJvH83Ql+wlIZFBdcRqCxRuz2+Nw6DxESIiApmyZ98dBPudH/+DBwdgGYLlNfFIALWfjzx41HTxSsx2e3UKWSPD3CthutMo3nJWJGFSJNoDEBg==;5:4lTIqZ57L+Rw2IX5x0vI/bfJo+PlqIF+nP1IXlw+S4khs7MKMVU5wJGgqww0+nxXp3B/ZkZHTEhqhKJsZQGcoceQ8chUB6i+8byW5Tkr17jGjEo/dUoeO/7psNivT0OM2QRq5qekLgapIgj1q+O6yeNkAlrB/G1AhUT0cGpSxqYixLalghDTqsEJHHVuJMTJ;24:M9oPR/OLt/cVXN1VhtM5YSBnCKvzbEQiEKhZxYT8ibdA3zUfdzApsVbcsWdW/qLnjHFE3jhUGH9jrakhVASWA2azhxBi9AQFbPZJg8or0v4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0912;7:YN9ECAos/FWYLlNCS21PVkWvnfj3yKGIZL1rNaqaEN1kq0eY0F8ebP35PNszOwIpLqLNBfOk446RC1oTVGYnmx8wx/Imx0FIJqZZUuUR9h9rFQ1MkoTbmeDw2HCiFIbJDGScCdD1OAom3h0Ku42hHfzf81MVeCeO0C/peBRi+3iqQ4xFRwm7u2xn4F/RNPOk7KZJrhkHEvRcZd42dSkV4lzpdxP9UT+JBONh5KMZn4nsbkG+lyqN+idpYrsBuDRAoO0k7958XlMjpkuKhYvL2KnTTaRMlEUUyL5AcqcgQ4b0300NHoiN8ULuwSq4Om+sChSOuNEVifwG4Fw0F58tMg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2017 12:09:48.5196 (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: DM2PR0301MB0912 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Laurentiu Tudor Remove several unneeded #includes, forward declarations and fix several issues reported by checkpatch.pl --strict, such as: - kfree(NULL) is safe and check is not required - macro argument reuse may cause possible side effects - enclose macro params in parens to avoid precedence issues - coding style Signed-off-by: Laurentiu Tudor --- Notes: -v2 -no changes drivers/staging/fsl-mc/bus/dpbp-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dpmng-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dprc-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dprc-driver.c | 10 +++++++--- drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 11 +++++++---- drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 12 +++--------- drivers/staging/fsl-mc/bus/fsl-mc-msi.c | 1 + drivers/staging/fsl-mc/bus/fsl-mc-private.h | 1 - drivers/staging/fsl-mc/include/dprc.h | 3 --- drivers/staging/fsl-mc/include/mc-sys.h | 1 - 11 files changed, 22 insertions(+), 25 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/dpbp-cmd.h b/drivers/staging/fsl-mc/bus/dpbp-cmd.h index 8aa6545..5904836 100644 --- a/drivers/staging/fsl-mc/bus/dpbp-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpbp-cmd.h @@ -40,7 +40,7 @@ #define DPBP_CMD_BASE_VERSION 1 #define DPBP_CMD_ID_OFFSET 4 -#define DPBP_CMD(id) ((id << DPBP_CMD_ID_OFFSET) | DPBP_CMD_BASE_VERSION) +#define DPBP_CMD(id) (((id) << DPBP_CMD_ID_OFFSET) | DPBP_CMD_BASE_VERSION) /* Command IDs */ #define DPBP_CMDID_CLOSE DPBP_CMD(0x800) diff --git a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h b/drivers/staging/fsl-mc/bus/dpmcp-cmd.h index 384a13d..861b2a7 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpmcp-cmd.h @@ -40,7 +40,7 @@ #define DPMCP_CMD_BASE_VERSION 1 #define DPMCP_CMD_ID_OFFSET 4 -#define DPMCP_CMD(id) ((id << DPMCP_CMD_ID_OFFSET) | DPMCP_CMD_BASE_VERSION) +#define DPMCP_CMD(id) (((id) << DPMCP_CMD_ID_OFFSET) | DPMCP_CMD_BASE_VERSION) /* Command IDs */ #define DPMCP_CMDID_CLOSE DPMCP_CMD(0x800) diff --git a/drivers/staging/fsl-mc/bus/dpmng-cmd.h b/drivers/staging/fsl-mc/bus/dpmng-cmd.h index cdddfb8..d1f04ac 100644 --- a/drivers/staging/fsl-mc/bus/dpmng-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpmng-cmd.h @@ -44,7 +44,7 @@ #define DPMNG_CMD_BASE_VERSION 1 #define DPMNG_CMD_ID_OFFSET 4 -#define DPMNG_CMD(id) ((id << DPMNG_CMD_ID_OFFSET) | DPMNG_CMD_BASE_VERSION) +#define DPMNG_CMD(id) (((id) << DPMNG_CMD_ID_OFFSET) | DPMNG_CMD_BASE_VERSION) /* Command IDs */ #define DPMNG_CMDID_GET_VERSION DPMNG_CMD(0x831) diff --git a/drivers/staging/fsl-mc/bus/dprc-cmd.h b/drivers/staging/fsl-mc/bus/dprc-cmd.h index e9fdca4..d9b2dcd 100644 --- a/drivers/staging/fsl-mc/bus/dprc-cmd.h +++ b/drivers/staging/fsl-mc/bus/dprc-cmd.h @@ -48,7 +48,7 @@ #define DPRC_CMD_BASE_VERSION 1 #define DPRC_CMD_ID_OFFSET 4 -#define DPRC_CMD(id) ((id << DPRC_CMD_ID_OFFSET) | DPRC_CMD_BASE_VERSION) +#define DPRC_CMD(id) (((id) << DPRC_CMD_ID_OFFSET) | DPRC_CMD_BASE_VERSION) /* Command IDs */ #define DPRC_CMDID_CLOSE DPRC_CMD(0x800) diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index d723c69..39c9a3b 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -21,9 +21,13 @@ #define FSL_MC_DPRC_DRIVER_NAME "fsl_mc_dprc" -#define FSL_MC_DEVICE_MATCH(_mc_dev, _obj_desc) \ - (strcmp((_mc_dev)->obj_desc.type, (_obj_desc)->type) == 0 && \ - (_mc_dev)->obj_desc.id == (_obj_desc)->id) +#define FSL_MC_DEVICE_MATCH(_mc_dev, _obj_desc) \ +({ \ + struct fsl_mc_device *__mc_dev = _mc_dev; \ + struct dprc_obj_desc *__obj_desc = _obj_desc; \ + (strcmp(__mc_dev->obj_desc.type, __obj_desc->type) == 0 && \ + __mc_dev->obj_desc.id == __obj_desc->id); \ +}) struct dprc_child_objs { int child_count; diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c index ce07096..d3def40 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c @@ -17,10 +17,13 @@ #include "dpcon-cmd.h" #include "fsl-mc-private.h" -#define FSL_MC_IS_ALLOCATABLE(_obj_type) \ - (strcmp(_obj_type, "dpbp") == 0 || \ - strcmp(_obj_type, "dpmcp") == 0 || \ - strcmp(_obj_type, "dpcon") == 0) +#define FSL_MC_IS_ALLOCATABLE(_obj_type) \ +({ \ + const char *__obj_type = _obj_type; \ + (strcmp(__obj_type, "dpbp") == 0 || \ + strcmp(__obj_type, "dpmcp") == 0 || \ + strcmp(__obj_type, "dpcon") == 0); \ +}) /** * fsl_mc_resource_pool_add_device - add allocatable object to a resource 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; } diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c index b8b2c86..a92fa5a 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c @@ -17,6 +17,7 @@ #include #include #include "../include/mc-bus.h" +#include "../include/mc-cmd.h" #include "fsl-mc-private.h" /* diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/staging/fsl-mc/bus/fsl-mc-private.h index 5c49c9d..01ef9329 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-private.h +++ b/drivers/staging/fsl-mc/bus/fsl-mc-private.h @@ -11,7 +11,6 @@ #define _FSL_MC_PRIVATE_H_ #include "../include/mc.h" -#include "../include/mc-bus.h" int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc, struct fsl_mc_io *mc_io, diff --git a/drivers/staging/fsl-mc/include/dprc.h b/drivers/staging/fsl-mc/include/dprc.h index dc985cc..2f4a7a7 100644 --- a/drivers/staging/fsl-mc/include/dprc.h +++ b/drivers/staging/fsl-mc/include/dprc.h @@ -33,8 +33,6 @@ #ifndef _FSL_DPRC_H #define _FSL_DPRC_H -#include "mc-cmd.h" - /* * Data Path Resource Container API * Contains DPRC API for managing and querying DPAA resources @@ -51,7 +49,6 @@ int dprc_close(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token); - /* IRQ */ /* IRQ index */ diff --git a/drivers/staging/fsl-mc/include/mc-sys.h b/drivers/staging/fsl-mc/include/mc-sys.h index dca7f90..b520370 100644 --- a/drivers/staging/fsl-mc/include/mc-sys.h +++ b/drivers/staging/fsl-mc/include/mc-sys.h @@ -46,7 +46,6 @@ */ #define FSL_MC_IO_ATOMIC_CONTEXT_PORTAL 0x0001 -struct fsl_mc_resource; struct mc_command; /** -- 2.9.4