From patchwork Fri Apr 1 17:56:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Lawrence X-Patchwork-Id: 8726961 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 14395C0553 for ; Fri, 1 Apr 2016 17:56:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1ABF4203C4 for ; Fri, 1 Apr 2016 17:56:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 814D0203C0 for ; Fri, 1 Apr 2016 17:56:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752059AbcDAR4m (ORCPT ); Fri, 1 Apr 2016 13:56:42 -0400 Received: from mail-by2on0140.outbound.protection.outlook.com ([207.46.100.140]:33328 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751732AbcDAR4l (ORCPT ); Fri, 1 Apr 2016 13:56:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=StratusTechnologies.onmicrosoft.com; s=selector1-stratus-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=I8rXqAiZ6Zsf8sJ7TbQUP/00wSQB11daHucIyZvQRqw=; b=CxBWOtD2jJE3vghYfZq3/mB9Av4hFBD6GBpMfrVEZqqDYBix/rI0vsfEivnOTTthn16Iiwm7wYiMmOzBNZBUi51TTqnp4yaHg+l/GQ14ihKCgoB4+DXgSoPjHT1KshtinuYmGQpJh1jqkOMjjjkW3jDR6+HzqC0TTzUP6Q3SpPY= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=stratus.com; Received: from jlaw-desktop.mno.stratus.com (198.97.41.12) by BLUPR0801MB580.namprd08.prod.outlook.com (10.141.253.140) with Microsoft SMTP Server (TLS) id 15.1.447.15; Fri, 1 Apr 2016 17:56:37 +0000 From: Joe Lawrence To: CC: Sathya Prakash , Chaitra P B , Suganath Prabu Subramani , Calvin Owens , Joe Lawrence Subject: [PATCH] mpt3sas - remove unused fw_event_work delayed_work Date: Fri, 1 Apr 2016 13:56:29 -0400 Message-ID: <1459533389-19648-1-git-send-email-joe.lawrence@stratus.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [198.97.41.12] X-ClientProxiedBy: BLUPR07CA0035.namprd07.prod.outlook.com (10.255.223.148) To BLUPR0801MB580.namprd08.prod.outlook.com (10.141.253.140) X-MS-Office365-Filtering-Correlation-Id: cdd91567-a331-4b27-1400-08d35a56f8fa X-Microsoft-Exchange-Diagnostics: 1; BLUPR0801MB580; 2:Do2ZELEGp2rJJftxhJJ6kGIi5U/RgpyEFpa25NKiCibDz3+bilMsXUBlOU99yCgq7LK2SzoTimlzTyZ6uBjO6ldHLXR+wR1KUKoQ9qGoYBbxg/hqRQRh/xn2tCI7hC8ARL7+ynETV86y58pQoQCOIxmMHAxz5bRaDEExlW4J8y/0xCbC7jn3tP+V30W2BmiC; 3:uMMqL5D6ey9JcwpMuufxQ1b/YUY6VAs0sQqC9WcqzGfN3VsBiwedVjEegpvM53itRIIa/MzY8mO8NnkiEH/eqEj0rq2Ye/i8M+fuzHbe+7NqCKUHmUzkZG5y3sHn5ec2; 25:5RxEpP1p9F2r41n+pAQZN+ldQ8LvgLgvFLT7l+b0HB8Hdk1ticqaN+OANQ5h8K+ojZGw2uudsLQGHDf3WskTXMnVc8uqct8Z6ErUzYH/fVzJErKvWp5GQaDbMmgrPuJeFDO6KDmCHhiVY1I25muL8KQSOrof9mNXmcKXF9MLGIs4rskXOmqtVWSEhmRXon2yYb+6Ha522vyMSci/szvoe2URAE5UtO7fBEOAPmu1Bb99mebKF30MudoUpZkLmO73/FwIBxhze8C1YNK4TJqykhbVX4+VS81jGaFpqBtcBszJbblA9FrKUX/S6c0iAPfCu1QyWhh3BmJW4ksFjjQf+P+GfCEb2LEcsHlypw/HX8s= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0801MB580; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0801MB580; 20:M44dHaaDJkyGgrPJuIUY/pd95O8O/8z2DcA9Tt2IqVflDUF7pniUtZC/c1xXX5ek88wLn+hOYoF7f/yCbR3Ng/Dbq1YS6Emu+68mPD+bhjIIoGAzqZdXqv3AqJVNx16HmWbO0jLv00YnGZBPxfsDyFgLJTaj1erTuJb/uGaZ+kMPBLagFmoeIZl1xQbohGSBrsArq7WFyZZRhXKtewItucFgVlhILyHRpSyJfZ8XMu1/BTPK90O12pLWbNKKXlQ8Fy7H8xud8FCIVigPeyZDaPWsz3F1l+o+EPrg1McoYhilF0N9qKwNNN5tc24rw9reo5fO5aXH+V+RvhKabwN9S2vfxyg1X+BWfTqT1+ZVlKGcvzuooIFgoSp/qBlF7fUgOOtxHPQS/lUE/RREGEcA05pWcgywL8NmS4RNbFCoBtfAsOWD+BPmMTfuhFaa+Ez0fN56E/QYGXGE/Z9vwQ3rGyya6PQI2K58ReA1HzEiO2izD28Kno/AKyqVMMVYDyAW; 4:yOcRTnaTZk3gxzgFPV4wqwSPAsqAR/vQt+NKauBZCNEW0KB7KZDkIb9ajNtotF9Grx4RSLh8PWjMRHUFlkrR/bIgRdCOS7x1J+GWetqaab7lH+aplnkvJ/WAmkLRN5dNecLNAe7/06xbYNVjNGAL/RM3eNyZKWLsT8S1fWxjxotr6bX8h8XxTdaAwGm4uzaBc4zEwT+YYaIcjc4m44KK6B8Z8peyWirdYsrRe4HYDv5gJTxFLR5ZiOATIWwvSMj5eVUf3F57AddB+/Is7GbNjuF64Kxs3PI7XaLdLQH2GYAT6BuyenzUMPBHQj2GEm/OhYDPSuvdoa9QsxabhV4KOQwDh1/F45Ah7H96Axxo2ye/w7U6Pbyhqe+14V8dWmbh X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001); SRVR:BLUPR0801MB580; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0801MB580; X-Forefront-PRVS: 0899B47777 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(42186005)(86362001)(48376002)(229853001)(2351001)(50986999)(66066001)(47776003)(110136002)(77096005)(107886002)(36756003)(5003940100001)(92566002)(2906002)(50226001)(575784001)(586003)(6116002)(189998001)(3846002)(4326007)(5004730100002)(4001430100002)(5008740100001)(81166005)(19580405001)(50466002)(19580395003)(1096002)(33646002)(42413003)(32563001)(4720700001); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR0801MB580; H:jlaw-desktop.mno.stratus.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0801MB580; 23:TCGvFwYFZz55Un+p5wvFS58XtLhXEneSvfFLgcaH?= =?us-ascii?Q?UKt5STbQs3H086Lv7vrnaOGCqUqMdzgqU5y23Z49lAMZVnnNEt/z8eRZyOh8?= =?us-ascii?Q?+jIDYLvvXkSjqXHV8UYXbm3cxi3ue55wd/xDE2vvZ7Ug8jp4YChbR2G3m4/h?= =?us-ascii?Q?NmX6tlr+SfgzDry5CnovIXDjOhFWZELdpL0rsfS/IG8m9s+eSPd/L30kCu4A?= =?us-ascii?Q?mzeYQTEqJooy4htkYIAbEqc0hJjUOHWyA4LDhh1Iuk7iD3E2LOwQTEZ0Tvq/?= =?us-ascii?Q?Vj9fAIwVwlAvc3EeeqVQue7gFKLJrp2kzIJ9KLRkeZNNFHdbhSgqFZu87gBV?= =?us-ascii?Q?XeVgSGEn3IRtHgq+g8vZ93r++fAvNwDP2HjzDqYAc58qgudqkjyoEF8CepJz?= =?us-ascii?Q?Zj4VPtmX6mHj3aRyEalAMkEZKvRmUz4Zg0UTaKpfagcb0oNQIIhzmKSukmsn?= =?us-ascii?Q?tCqD5n6Wrr6tORBflDCMJzzJngjOCc1ovBNovV0nLwj9v+irhAO2ce8n0niL?= =?us-ascii?Q?SMswtGhNL7MDpm5CwT0dvrlj9g4KTb3STlkOKgzpZUgi8aNxYyztU8Z40bSI?= =?us-ascii?Q?8WC8XsN2dqcTHAlLfk2yLC9lQkRoS8qyEOeIYxoWZ/kyhFmHlem4B3Dup10D?= =?us-ascii?Q?GaO9bH949/+0XuntGQmuFTGE9NhxN+/pUMWb622m/IQ45IrgejV4qNsLH00A?= =?us-ascii?Q?dx04ZQW2nWy1CQqaRTr4NFBsdNGWxaNXYCgMiheIkmTAtpdi50qNVBR+SGee?= =?us-ascii?Q?G2f9e/pycF5itz5kx6NxZ5xzNIN+/rfEC18g0EdRt/0cXzB8Kt/8cKCSfnPv?= =?us-ascii?Q?Zaqcqn5wxUhnher7Hazm9iaH+150WPtUjeF6FzVSM8BhP6NLCJJoGm1BbP1F?= =?us-ascii?Q?bP42WCucfT6ii19PxL/LlTvDgl7T+n95UQGNLz3ABrE3xzA8roX40YSKpsJ/?= =?us-ascii?Q?A1TchnAJdEt+xjubnPN6fNekqWiw6YR58A7zbccXOL46Qm+ivA1CWqb0fs26?= =?us-ascii?Q?J2U=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0801MB580; 5:E6sedHwsLEr55AaVoTS3oE99dPONnObUGyhXlzJexhat5Ruyo//KSzIjkP/fTNmv96j3ux9Pbh1nn0hD5xnsANVNCX6boEwuMBpY3ExQIVh1XsSSwiv4B7hunq03AaCwMG0rrB9C/7a7opVIGKUEqQ==; 24:m7cT4ZZWnVEudY967Nx1HfZXAzhPTNBfi2glgt6oumQPih5dSMIt4t3oMXpSMdzh3pVtNv+MrVfJOTH4bfynT45cxOroPrxX2Mu+9MCZP/4=; 20:Xg/V+YkccVJJJPSvv6I9I4RAyc5oQWnAq+wTHdyi3EYg7c/WzQC8AQpbIihwhh9fxoIwQIW0ofCr+eKwRMFZCaW51TJs8RLrNR/SFHI5qfjd7FQtlTbPjsFgZCoGcnfdCYrx1fqQlGNnQyL6BXkq15cjWBCw3dnAv8dFN/FUIJI= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: stratus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2016 17:56:37.8479 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0801MB580 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The driver's fw events are queued up using the the fw_event_work's struct work, not its delayed_work member. The latter appears to be unused and may provoke CONFIG_DEBUG_OBJECTS_TIMERS "assert_init not available" false warnings in _scsih_fw_event_cleanup_queue. Remove it and update _scsih_fw_event_cleanup_queue accordingly. Signed-off-by: Joe Lawrence --- I think this goes all the way back to the introduction of the mpt3sas driver. The previous generation mpt2sas driver uses delayed_work, so perhaps it was simply copied and pasted into the mpt3sas but never updated. drivers/scsi/mpt3sas/mpt3sas_scsih.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index e0e4920d0fa6..67643602efbc 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -189,7 +189,6 @@ struct fw_event_work { struct list_head list; struct work_struct work; u8 cancel_pending_work; - struct delayed_work delayed_work; struct MPT3SAS_ADAPTER *ioc; u16 device_handle; @@ -2804,12 +2803,12 @@ _scsih_fw_event_cleanup_queue(struct MPT3SAS_ADAPTER *ioc) /* * Wait on the fw_event to complete. If this returns 1, then * the event was never executed, and we need a put for the - * reference the delayed_work had on the fw_event. + * reference the work had on the fw_event. * * If it did execute, we wait for it to finish, and the put will * happen from _firmware_event_work() */ - if (cancel_delayed_work_sync(&fw_event->delayed_work)) + if (cancel_work_sync(&fw_event->work)) fw_event_work_put(fw_event); fw_event_work_put(fw_event);