Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756995Ab3J2Abi (ORCPT ); Mon, 28 Oct 2013 20:31:38 -0400 Received: from smtp.codeaurora.org ([198.145.11.231]:39787 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753541Ab3J2Abd (ORCPT ); Mon, 28 Oct 2013 20:31:33 -0400 From: Stephen Boyd To: linux-edac@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/6] edac: Don't try to cancel workqueue when it's never setup Date: Mon, 28 Oct 2013 17:31:25 -0700 Message-Id: <1383006690-6754-2-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 1.8.4.1.600.g3d092bf In-Reply-To: <1383006690-6754-1-git-send-email-sboyd@codeaurora.org> References: <1383006690-6754-1-git-send-email-sboyd@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3514 Lines: 61 We only setup a workqueue for edac devices that use the polling method. We still try to cancel the workqueue if an edac_device uses the irq method though. This causes a warning from debug objects when we remove an edac device: WARNING: CPU: 0 PID: 56 at lib/debugobjects.c:260 debug_print_object+0x98/0xc0() ODEBUG: assert_init not available (active state 0) object type: timer_list hint: stub_timer+0x0/0x28 Modules linked in: krait_edac(-) CPU: 0 PID: 56 Comm: rmmod Not tainted 3.12.0-rc2-00035-g15292a0 #69 [] (unwind_backtrace+0x0/0x144) from [] (show_stack+0x20/0x24) [] (show_stack+0x20/0x24) from [] (dump_stack+0x74/0xb4) [] (dump_stack+0x74/0xb4) from [] (warn_slowpath_common+0x78/0x9c) [] (warn_slowpath_common+0x78/0x9c) from [] (warn_slowpath_fmt+0x40/0x48) [] (warn_slowpath_fmt+0x40/0x48) from [] (debug_print_object+0x98/0xc0) [] (debug_print_object+0x98/0xc0) from [] (debug_object_assert_init+0xdc/0xec) [] (debug_object_assert_init+0xdc/0xec) from [] (del_timer+0x24/0x7c) [] (del_timer+0x24/0x7c) from [] (try_to_grab_pending+0xc0/0x1b0) [] (try_to_grab_pending+0xc0/0x1b0) from [] (cancel_delayed_work+0x2c/0xa0) [] (cancel_delayed_work+0x2c/0xa0) from [] (edac_device_workq_teardown+0x1c/0x38) [] (edac_device_workq_teardown+0x1c/0x38) from [] (edac_device_del_device+0xb8/0xe4) [] (edac_device_del_device+0xb8/0xe4) from [] (krait_edac_remove+0x50/0x70 [krait_edac]) [] (krait_edac_remove+0x50/0x70 [krait_edac]) from [] (platform_drv_remove+0x24/0x28) [] (platform_drv_remove+0x24/0x28) from [] (__device_release_driver+0x68/0xc0) [] (__device_release_driver+0x68/0xc0) from [] (driver_detach+0xc4/0xc8) [] (driver_detach+0xc4/0xc8) from [] (bus_remove_driver+0xac/0x114) [] (bus_remove_driver+0xac/0x114) from [] (driver_unregister+0x38/0x58) [] (driver_unregister+0x38/0x58) from [] (platform_driver_unregister+0x1c/0x20) [] (platform_driver_unregister+0x1c/0x20) from [] (krait_edac_driver_exit+0x14/0x1c [krait_edac]) [] (krait_edac_driver_exit+0x14/0x1c [krait_edac]) from [] (SyS_delete_module+0x178/0x2b4) [] (SyS_delete_module+0x178/0x2b4) from [] (ret_fast_syscall+0x0/0x48) Fix it by skipping the workqueue teardown for such devices. Signed-off-by: Stephen Boyd --- drivers/edac/edac_device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 211021d..203561b 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c @@ -437,6 +437,9 @@ void edac_device_workq_teardown(struct edac_device_ctl_info *edac_dev) { int status; + if (!edac_dev->edac_check) + return; + status = cancel_delayed_work(&edac_dev->work); if (status == 0) { /* workq instance might be running, wait for it */ -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/