From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752356AbaEOK7z (ORCPT ); Thu, 15 May 2014 06:59:55 -0400 Received: from mail-vc0-f181.google.com ([209.85.220.181]:42856 "EHLO mail-vc0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752019AbaEOK7x (ORCPT ); Thu, 15 May 2014 06:59:53 -0400 Subject: [PATCH v1.2 18/16] arcmsr: replace calling flush_scheduled_work by flush_work From: ching To: jbottomley@parallels.com, dan.carpenter@oracle.com, thenzl@redhat.com, agordeev@redhat.com, linux-scsi@vger.kernel.org, "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset="UTF-8" Date: Thu, 15 May 2014 18:59:43 +0800 Message-ID: <1400151583.7179.9.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.32.3 (2.32.3-30.el6) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ching This is a new patch v1.2 18/16 after patch v1.2 17/16. To prevent flushing entire workqueue, replace flush_scheduled_work by flush_work. Signed-off-by: Ching --- diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c --- a/drivers/scsi/arcmsr/arcmsr_hba.c 2014-05-14 18:29:30.000000000 +0800 +++ b/drivers/scsi/arcmsr/arcmsr_hba.c 2014-05-15 17:53:12.000000000 +0800 @@ -845,7 +845,7 @@ static int arcmsr_suspend(struct pci_dev intmask_org = arcmsr_disable_outbound_ints(acb); arcmsr_free_irq(pdev, acb); del_timer_sync(&acb->eternal_timer); - flush_scheduled_work(); + flush_work(&acb->arcmsr_do_message_isr_bh); arcmsr_stop_adapter_bgrb(acb); arcmsr_flush_adapter_cache(acb); arcmsr_enable_outbound_ints(acb, intmask_org);