From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965431AbbJVSA6 (ORCPT ); Thu, 22 Oct 2015 14:00:58 -0400 Received: from mail-by2on0071.outbound.protection.outlook.com ([207.46.100.71]:55744 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965378AbbJVSAy (ORCPT ); Thu, 22 Oct 2015 14:00:54 -0400 Authentication-Results: spf=fail (sender IP is 66.35.236.236) smtp.mailfrom=opensource.altera.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=opensource.altera.com; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=atull@opensource.altera.com; From: To: CC: Josh Cartwright , Moritz Fischer , , , , Alan Tull Subject: [PATCH 2/2] fpga manager: remove unnecessary null pointer checks Date: Thu, 22 Oct 2015 12:38:38 -0500 Message-ID: <1445535518-13406-3-git-send-email-atull@opensource.altera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1445535518-13406-1-git-send-email-atull@opensource.altera.com> References: <1445535518-13406-1-git-send-email-atull@opensource.altera.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BY1PR0501CA0005.namprd05.prod.outlook.com (25.162.139.15) To CY1PR03MB1517.namprd03.prod.outlook.com (25.163.17.23) X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1517;2:tSBU8mM4Q/5AeiaCyMJKsVNUl4vK6fCSQA2kJBnhIY+tUawVR62xCn3NHjGQVuSGH1uCC5j19K+hdMaoLQ77qMrHf6SxBn4S2dhBApcOALayjSVyqQBiGrzROb7AciYus9Q3RSmL1Da/ZNSuLejavTtIW36qqAPylZ5dy5PrKyA=;3:jMEMzs/ALpEwxnDPMDgfUUpI7S2RWE/+X1HERZk5seRhs19HKO/pY14Wp5k7gaQ/JPYiOQRIBEQJOs/HyoM1E/sWmYiKgydNbhq68RxjpzKxgBSa9QJUG8Rh6PYo7bRmHAFTAIBl74GAXdghlWpaSw==;25:CLAwgQWTZlsv+rQWtMlnLbhchGaC11kAILjyFpKtYSU+g5pBf3aObQfu918tWW/mQuI6osKHO8xnGu4zOqpcKxkaJf4e/wnndeamAuinxcuRrq5fxqtLiKqZ/VOUU1Le1QaqbMDpS+AmxJoXOxHMvz0iWkGkND6D+MgEGXLo7SeggF50wLHf6sL1R/EOe3jq+NPqPnusFdFiUpWNMHDHBJdzU/k17h4oRyA2u+WUKpgJa0Am+h+/BRyqjlYCD72RQNZyAqfrW2zrXZgXMTiifg==;20:7mCWYpKTRo4FS+6NPQSD7j4dgr7iVDf8+Ni8LHSV4+tbSAzAoxvkg8wC0hqSkGGc3lsJ8BrLCFe7s5aYyPnOcPk7sr96UNFNRzQ9uQJQiLy+qvKr7ffNH22/UKDj3cyS+1zTIOA25SKbEMXQL+vjee3XPcOd3/zaK95ACOc6jV8= X-Microsoft-Antispam-Untrusted: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1517; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(80048183373757)(204874498639787);UriScan:(80048183373757)(204874498639787); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001)(102215026);SRVR:CY1PR03MB1517;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1517;BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(102215026);SRVR:SN2PR03MB045;BCL:0;PCL:0;RULEID:;SRVR:SN2PR03MB045; X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1517;4:woz6Hmi5SP0KavmPdE4ByuPkfKEq9/eWU3sT8hLPOFcjq++CeD4dL2Heuh7lbe906SIEwHHbYpq0eP48tuD41XDn1hXjv/vq2OgVZ3IVUtjAI8bec3dNNr4YcECK07vJKKroyOBV8dN1PBtul3EqxNwukZdaGQ4r9ag4kbspY0LTlGtMAVEu+wyyq535IMllvJ1Lzo0LkmlJawGaYbhkPICgUxqq8jf0qzNOdvTHjHmDpfFCV4YRpUrU5Qwz4xqHMvuGZestbpAiuLSNtxs9nvfPGC7kzvjHVSaCApctTT+fHx6GE1LcrPZU3DD3k5pUAjVPSVp4sXNela9USOOdM+lTJVYibWm28g3mrvG17GnRTabG5ToMtRBowpeCGSiE X-Forefront-PRVS: 0737B96801 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(6009001)(199003)(189002)(69596002)(50226001)(5003940100001)(19580405001)(19580395003)(87976001)(122386002)(189998001)(5001960100002)(110136002)(107886002)(50986999)(86362001)(76176999)(46102003)(106356001)(40100003)(2351001)(229853001)(105586002)(86152002)(101416001)(33646002)(64706001)(47776003)(5007970100001)(97736004)(5004730100002)(92566002)(81156007)(53416004)(66066001)(42186005)(2950100001)(5008740100001)(48376002)(50466002)(77096005)(4001430100001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR03MB1517;H:linuxheads99.altera.com;FPR:;SPF:None;PTR:InfoNoRecords;A:0;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics-untrusted: =?us-ascii?Q?1;CY1PR03MB1517;23:IvxSLmGiyOp+sX7j0vJkIspwVeZoiixmyp+GBcta0?= =?us-ascii?Q?vD+zwwkm3onEbpzpfkwL6uRKK17AFd+oIYw2G+1FdRUD2FTRgwBr8SKhip4k?= =?us-ascii?Q?DrrrcnwIa5R3bjtQMTYvfjrOjzRCg/A7L9qJ2vxlzW0ZKjyMNpwHmxMFt6zw?= =?us-ascii?Q?kw1o8+L2hTZxY7KOj26IqFijepJ/AovCwwYEBrfrJiU3nnVwvIOePZ73PQ2H?= =?us-ascii?Q?a5EUTHKaMHiAkK0aV2fD3uVa1r31s40Ywg/KNx73jmaPMcKQclY4wml7S+Zn?= =?us-ascii?Q?AX0JFuYQzkyed0XFgfYSF51bolvTMZhqpCXN9BVEQLmSSRWLIHvf2I/0baee?= =?us-ascii?Q?SSTRy46Gbu8LG2EyE910WmVtpQtXYOktL+peCDERO6ILHiiDDvlP+OXloK+C?= =?us-ascii?Q?63na3goVBNDZellq+vfImQ/TUEspyK83BAdx+VHEZYMqZeZ1QMf1oL5Y6Rjm?= =?us-ascii?Q?L58lL7Wi3TKzYSvBoLkpebGxh4NMt0lglpsGpX88srXohuxnoYVn0w7r6zto?= =?us-ascii?Q?BqCCw4gi7hOpLWsmS7mxHF5d9wng8qlM9Fp2jzzZ3dDEtYX0LwakfHz8u1Bl?= =?us-ascii?Q?rDVjBZZjjv7CIUXvABRIkYYygF+7NrgIzRgVhAEZovRaYy3PJHObsyrQdslJ?= =?us-ascii?Q?fUTu7vGdxpkSdNf8ng8mDUPwOkJCOrNEulfzwt5HEg4J89JTM6x7UhQfzDXa?= =?us-ascii?Q?A6Sx6jA4dKv+hix0KPJEYDRS2n0n/ITgapMV4mV3rCv+bKy8paFF9LmdL6GI?= =?us-ascii?Q?+34urt9O/IFV76Zf7lcLr1wSJhf28x+sv/QFCID+8oTITL9eOpREXarsfaZ5?= =?us-ascii?Q?gfoS/dbh0AuLBDiopKbRdleO2DOT3gzmSX1VTlBroPLFhkIVhYhANC2Nlduj?= =?us-ascii?Q?Fe1GyOq6j7r9zJCpgnh/wr20F+5pRlkP/mBiTax0l42ExVUO+YEVQeaDPVyq?= =?us-ascii?Q?AgDPIM5U3z4skUcDsOxM3S7gsVQdpujcXBASGASNzQkCoN/EADkUwkkhrzhy?= =?us-ascii?Q?ED1ktt4Hdm1x0D36uomux9PgFh/lei0MpD+ZzSdLrYtYZORO9w6s3VXY6ysU?= =?us-ascii?Q?C3xYTXJApnUu0YNNVaPCvDDGOJXv1dUKeXN9c/9Bc2zNh25RLeNGKGjfFZYK?= =?us-ascii?Q?veL+youavB7ExlAhjFEeAaQHm3db52L?= X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1517;5:4hqlhD6Et96IlXU7Rzaot1O7DR7R1fk4J5ch7tnb68w5JYBFkbfVhQboHa2DB+vXcQeqTsdoH04SqPtdlX0XtU8fzG7rAqFLxvOpaA6nYRqGr4efR07UZObvv7Vrpvv6RproMCMkill2a44GF2CRtA==;24:9u1nnOO22wx70RH0WB0S6ldxP6UzbojBG9asUHMSZ61LjHkAGDUR9q1/2xUrUvy8q3J/gjOHHyuKy+ZrWpDDow8BpwZY0ZdDQWwlzRLnEIM=;20:IMME9Hp9QW7pRzsve6r+pDrQqiLTIYZeYZ3N7c9CWOd8MgqluQK+ebLmOevPuSGi5cmc/5CpB+0i4a5bclLMaX3Fa5/NWl1sPvbFHon0qIocK8QHYU9NRTXE7dmZdIFNyoLSnU3vRa8BleiVVAyeIuXmqavcG85KYdade00tD7I= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1517 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BN1BFFO11FD049.protection.gbl X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD049;1:I/soHOhhgf1UXdymAscP/maeABnVHwqC2Uq9V+RSz1SgLO9Mx+dFipFKjE6wSNm/k6r5S7/ELkZtY/ic9/evCTGsTnquUyCFpKBlyYLUATBVTlNIkUmZJfdySDXaySHLRSbvQ+w71MVAYzjv6UpESFieLo25zkbhXvZolj17mbvHTxYV32JahUnRGqCcnh+z1Pc7lEvM/HuIVZ8EaK2RUXNwZHU6RTnOLvpBrWGGuVmO/QwCP3jutNOacbN2HdtrBpxwgLVeJBZZIXJla2gN6G8ZHMyONvdhFwfe/UgMpE0wznioseOJDjOPgmtO38gZVSFMCjTUTLmTdM/xmTljvyqakllUHwTG1/NHV/5lzQifCj0OFn1d0WLngnQ4FIX4 X-Forefront-Antispam-Report: CIP:66.35.236.236;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(66066001)(76176999)(53416004)(50466002)(77096005)(2950100001)(85426001)(64706001)(48376002)(92566002)(40100003)(47776003)(87936001)(5003940100001)(19580395003)(16796002)(33646002)(46102003)(229853001)(19580405001)(122386002)(97736004)(50986999)(6070500001)(5007970100001)(106466001)(50226001)(11100500001)(5004730100002)(81156007)(21840400001)(189998001)(107886002)(2351001)(6806005)(5008740100001)(110136002)(86362001)(5001960100002)(105606002)(86152002)(7099028)(4001430100001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN2PR03MB045;H:sj-itexedge04.altera.priv.altera.com;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:0;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;SN2PR03MB045;2:NhoaiggzR4+uTA+OFao0hm1CHo5JuTVs/NTJOite/glo6QNze4Br+8aXPVs6NP0v/kbsLqd5zvkRaHLupkjVBWav/dsvWt7ipAwUF+mZKWb/v1foNRhs5frs2Y0CGyrMJmVsdV2p3IngQD6L+8SasEkqt32gqIUzKGoON9FX0A8=;3:soLAUIa6oshqOREVYQ7r4ifH9hmYd9e6cpz3QynbBZB+nBwkjlecuDenEZ1hjfhtfjRvLCYHa+ld+2VuH6qoyg1gWOvrv0D0UU6ZT/nClHLM8SM5JhJAw30cuQDHp8gL9acq2eS47ZGSEeRj+OPYPkHPF5R7pS14oPsRCJa6t3fBFjt4GzruXxyEAhZNEvm9pa3/B60uhlHK9pJjFJpRpYwtBAUcAU06cYRZVlfj0xc=;25:Ay5Gf8MkaWO4Oo55DRwpUNy13KGl7Szl03PYgcNgFqB6dOkr80/CwFRO/hefIGqomaC7Vug2hyGFoinntxwMTj7gnkLgxoHOo+iC03g7Sw8NDryzDwWzwKje1/K9FLF7reNbGxo2Cuy0ge8SNY1SlgcU8xe3uhF65c58n9giuIwZojfMww5KYGHZS5Pitu5JUSBg/WpIK1cEjOCBebFn2bX98+LN6WChZbKtFSrsRUdRit/4rBIujh1JBnLWQPNreQgrw4IYwBl3RJNghrSEKg==;20:rYGou5E4NzDkm2i6+rdLIsP+mG1a4JWQYQLZh2nwzJboycXUCZ9A02EZLpXxKR2dCH4wl43bpT0yBgsx3ql0C2w51AcSyb+GgT8+mD+HcvJWgJr6CZSirxrAF3O/uktQFr5qHVw5k8qGhaXDcdJ7w/k9MLk6T2kyjQWB7cym1XQ= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN2PR03MB045; X-Microsoft-Exchange-Diagnostics: 1;SN2PR03MB045;4:+WrB3FoxnnO5fQiNp0CGpzT/go8GI3AdhqN36bqKy28KGtJp8DHp4mDVSXB4SdxsKxv+wEzqKuSO4jkDqjYuYYwYOa+yvAX0zxzHvGTPWbIcZsWrDYKa4OrtLq7sqOpKL1uWC6GEuZQEpJ76hhNkLWAVbupDCZnxjRURedgj0IivBOGocuk3vVEmM4ap9ERX8T1tSNGJtqVX/xcIMxH0QCHYtoIKjaufD03UW46kKxqPpvMy5hqBbCeChYPsXjhyHneH11sfEjYan3F9Ey1XA+sPFhM79bhBUzHsASHokvVkhPnVwgA1NsqoI7RQSPsXw48fJDMuxGHOBIRPd99Yvv9RKnU6NdVXfGt/2KPmd1xaQXVejDPOwPc4FJx23qnM X-Forefront-PRVS: 0737B96801 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN2PR03MB045;23:/aZgAjJUl/WIszE1w+onrTtUWEgoVd4JdccAV1BeN8?= =?us-ascii?Q?hsHJiy2s9xby8EhIik0yOrd0eTFCI9t8aJy14XZLG44IZWtiqI6Ehz0Wq1Nc?= =?us-ascii?Q?+2FKFkqEEZ4nmPliwXoruJ42hYH7zZVFfybZqG1MRNevh7GQ65cQXoC19Wta?= =?us-ascii?Q?B2xkmXsa4J66wX2nKVcPVGa1rJQICN/LNz9GRWeZgJKQnek5bmMjBXWvlXGt?= =?us-ascii?Q?o3c0JJ/KIxnLy+D8zaYws2Ej6VaZE8Yqu3JQGaGVI5Nivm1YU/HZr6DREO9L?= =?us-ascii?Q?j0tx9aE0l6ESTjKcyjyr9ieiMH1EmuCL6hd3ccwACrulqrbCVebIsGBRZBgc?= =?us-ascii?Q?WpxpNUdzJtC2pyiM7rf92ikzgq1ozNHg0wSeDfjtwqsiGUhOwV+whBGm+ywA?= =?us-ascii?Q?Cn3MMqIUjcJMP6+/xIFm98PXRb1PElCw4Rp0YRqOAS0C9Gv6dAaYLzhZS5pM?= =?us-ascii?Q?oihiO6EsSt8aN++bw+zxZnZp2bxXCBt4vyG61EIt0dVf0snsQveGT911HRkU?= =?us-ascii?Q?EKxfA9dWrwHG/p5zDZchcgfGQKJ02mgYqODNVRD3HviHdgPHJoPqgaPcAnv6?= =?us-ascii?Q?CkWE0mDoy+wNuKn3gLQsCxio+eGaMlnsNF3SLo2h2ksXf/ieX0ZAeXGDApGJ?= =?us-ascii?Q?Jvhh+ycnC8rtOXpRvPcZ6SeFsWKRWpxb1GioivV2k+WcgjdQmRpxW8EAQhW8?= =?us-ascii?Q?7OTamhTJ8rW1rCvIVFSZe5j351K2RQXQJkiQJ0SYXx0oWC9EIA+eBVV5DD+h?= =?us-ascii?Q?sOjXxBWNne1M9ZMZyb5dBd96nHHkddUixD/gcWxOWfav77HhChcLBooH+bNN?= =?us-ascii?Q?+czCrmoadFKUh1Af0ITTrY9iYncVUuMpPd49Xp/QoS7LlwXuzTBhW406PFSQ?= =?us-ascii?Q?nO3kcYUPlsm8mXmWdFnfNL2oWfzo3gmB+DMQmtU4acFdRxt6MwHiV/0ou8il?= =?us-ascii?Q?7GUPjoOoo1stuQS5hD+p9o0d6U9jK8Ykq0myuUcHLLd2cPTMJLvdP5kf0xPG?= =?us-ascii?Q?BZ7yU8kI/OM4ISkM3h1MBFgm8kqInW2aeAYIL7CP+WTZTiC2O+urLZk3SHIF?= =?us-ascii?Q?Wo+86MqwItlnaXRH5LzZkT1hin9sUPC3zruimoTNVrdiMMYjPBPPyVrTkVPP?= =?us-ascii?Q?OcC1KonNSqrQlntEXr8xxM5gGxGZt9sh/eFyHl9/2oNTEb/gmKEgr4/cw0qd?= =?us-ascii?Q?wvEHjpumsNFT2b1yi+nLeLNuunt+JlrTihB0GG3YcQq7HsvRQL+Osb8r1RyY?= =?us-ascii?Q?6kEwpbXNDaKiqJIkjaVtM0rVkkJzlmfyktkwGeTRc8ejvr60tGd2N2i1b+zL?= =?us-ascii?Q?IRvTleqC2EuWxWHatIRqU=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN2PR03MB045;5:IGxBVPe4cqxVwWyLJ1JTrXeHzSBXJ5mZHPuHmpNwZEo4MVMPYdBoAGGcFxvNaYoYYDhD3RlC/KoHpFSYWM4axisitVtwjMqCEDD2q79ADEkvOn4k5gK9JELESpIlCis7nScozY1fyOlFcQjfHm2nAg==;24:5PETZgpGUOSaAMDVgIyxxTgZz4hgyJH1WmlXFv1tu97N5a6OxnoCFhLz8liv/+zaU//3v5E4adhpJ+oeUiyROC/Ge/yva9hVINXjojOS0O8=;20:/V/TsIEWHA2XDKmbjWE3YYAuMDQ/bCq5Na8gg/ir3EvNqN7USK0jSfqXIUvqVXvc6/Qozu45bBBxFRTgEkeJkP9Rc6b+x18ka4x3WJr/5H9D1FwQ1wcyBXFMg4QGXjgVOxXTO52TerMHMbfRnZq7eWxvz0fQzguJ6l//y/Ng5v4= X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2015 17:45:40.6684 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a;Ip=[66.35.236.236];Helo=[sj-itexedge04.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB045 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alan Tull Remove unnecessary null pointer checks. We want the caller of these functions to do their own pointer checks. Add some comments to document this. Signed-off-by: Alan Tull --- drivers/fpga/fpga-mgr.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index 68d7b41..a24f5cb 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -38,7 +38,8 @@ static struct class *fpga_mgr_class; * * Step the low level fpga manager through the device-specific steps of getting * an FPGA ready to be configured, writing the image to it, then doing whatever - * post-configuration steps necessary. + * post-configuration steps necessary. This code assumes the caller got the + * mgr pointer from of_fpga_mgr_get() and checked that it is not an error code. * * Return: 0 on success, negative error code otherwise. */ @@ -48,9 +49,6 @@ int fpga_mgr_buf_load(struct fpga_manager *mgr, u32 flags, const char *buf, struct device *dev = &mgr->dev; int ret; - if (!mgr) - return -ENODEV; - /* * Call the low level driver's write_init function. This will do the * device-specific things to get the FPGA into the state where it is @@ -100,7 +98,8 @@ EXPORT_SYMBOL_GPL(fpga_mgr_buf_load); * * Request an FPGA image using the firmware class, then write out to the FPGA. * Update the state before each step to provide info on what step failed if - * there is a failure. + * there is a failure. This code assumes the caller got the mgr pointer + * from of_fpga_mgr_get() and checked that it is not an error code. * * Return: 0 on success, negative error code otherwise. */ @@ -111,9 +110,6 @@ int fpga_mgr_firmware_load(struct fpga_manager *mgr, u32 flags, const struct firmware *fw; int ret; - if (!mgr) - return -ENODEV; - dev_info(dev, "writing %s to %s\n", image_name, mgr->name); mgr->state = FPGA_MGR_STATE_FIRMWARE_REQ; -- 1.7.9.5