From patchwork Thu Jul 26 10:05:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lu X-Patchwork-Id: 173387 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 88F632C0080 for ; Thu, 26 Jul 2012 20:07:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751982Ab2GZKGY (ORCPT ); Thu, 26 Jul 2012 06:06:24 -0400 Received: from va3ehsobe006.messaging.microsoft.com ([216.32.180.16]:25073 "EHLO va3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751252Ab2GZKGQ (ORCPT ); Thu, 26 Jul 2012 06:06:16 -0400 Received: from mail121-va3-R.bigfish.com (10.7.14.245) by VA3EHSOBE006.bigfish.com (10.7.40.26) with Microsoft SMTP Server id 14.1.225.23; Thu, 26 Jul 2012 10:06:11 +0000 Received: from mail121-va3 (localhost [127.0.0.1]) by mail121-va3-R.bigfish.com (Postfix) with ESMTP id 4734A1C028E; Thu, 26 Jul 2012 10:06:11 +0000 (UTC) X-Forefront-Antispam-Report: CIP:163.181.249.109; KIP:(null); UIP:(null); IPV:NLI; H:ausb3twp02.amd.com; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VPS0(zzzz1202hzz8275bhz2dh668h839hd24he5bhf0ah107ah) Received: from mail121-va3 (localhost.localdomain [127.0.0.1]) by mail121-va3 (MessageSwitch) id 1343297168921786_8946; Thu, 26 Jul 2012 10:06:08 +0000 (UTC) Received: from VA3EHSMHS015.bigfish.com (unknown [10.7.14.250]) by mail121-va3.bigfish.com (Postfix) with ESMTP id D2B8038007E; Thu, 26 Jul 2012 10:06:08 +0000 (UTC) Received: from ausb3twp02.amd.com (163.181.249.109) by VA3EHSMHS015.bigfish.com (10.7.99.25) with Microsoft SMTP Server id 14.1.225.23; Thu, 26 Jul 2012 10:06:06 +0000 X-WSS-ID: 0M7RIQ3-02-3OO-02 X-M-MSG: Received: from sausexedgep02.amd.com (sausexedgep02-ext.amd.com [163.181.249.73]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp02.amd.com (Axway MailGate 3.8.1) with ESMTP id 2B5EDC80D1; Thu, 26 Jul 2012 05:06:02 -0500 (CDT) Received: from sausexhtp02.amd.com (163.181.3.152) by sausexedgep02.amd.com (163.181.36.59) with Microsoft SMTP Server (TLS) id 8.3.192.1; Thu, 26 Jul 2012 05:06:18 -0500 Received: from sausexmb1.amd.com (163.181.3.156) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server id 8.3.213.0; Thu, 26 Jul 2012 05:06:03 -0500 Received: from storexbh1.amd.com ([10.1.1.17]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 26 Jul 2012 05:06:02 -0500 Received: from sshaexmb1.amd.com ([10.237.2.11]) by storexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 26 Jul 2012 06:06:01 -0400 Received: from aarontestpc.amd.com ([10.237.73.70]) by sshaexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 26 Jul 2012 18:05:58 +0800 From: Aaron Lu To: James Bottomley , Alan Stern CC: Jeff Garzik , Lin Ming , Jeff Wu , , , , , Aaron Lu , Aaron Lu Subject: [PATCH v3 4/7] scsi: sr: block events when runtime suspended Date: Thu, 26 Jul 2012 18:05:26 +0800 Message-ID: <1343297129-28174-5-git-send-email-aaron.lu@amd.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1343297129-28174-1-git-send-email-aaron.lu@amd.com> References: <1343297129-28174-1-git-send-email-aaron.lu@amd.com> X-OriginalArrivalTime: 26 Jul 2012 10:05:58.0503 (UTC) FILETIME=[40D90770:01CD6B16] MIME-Version: 1.0 X-OriginatorOrg: amd.com Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org When the ODD is runtime suspended, there is no need to poll it for events, so block events poll for it and unblock when resumed. Signed-off-by: Aaron Lu --- block/genhd.c | 2 ++ drivers/scsi/sr.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index 9cf5583..bdb3682 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1458,6 +1458,7 @@ void disk_block_events(struct gendisk *disk) mutex_unlock(&ev->block_mutex); } +EXPORT_SYMBOL(disk_block_events); static void __disk_unblock_events(struct gendisk *disk, bool check_now) { @@ -1502,6 +1503,7 @@ void disk_unblock_events(struct gendisk *disk) if (disk->ev) __disk_unblock_events(disk, false); } +EXPORT_SYMBOL(disk_unblock_events); /** * disk_flush_events - schedule immediate event checking and flushing diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 2573a42..fd1c2f6 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -204,6 +204,8 @@ static int sr_suspend(struct device *dev, pm_message_t msg) return -EBUSY; } + disk_block_events(cd->disk); + return 0; } @@ -225,6 +227,8 @@ static int sr_resume(struct device *dev) atomic_set(&cd->suspend_count, 1); } + disk_unblock_events(cd->disk); + return 0; } @@ -314,9 +318,6 @@ static unsigned int sr_check_events(struct cdrom_device_info *cdi, if (CDSL_CURRENT != slot) return 0; - if (pm_runtime_suspended(&cd->device->sdev_gendev)) - return 0; - /* if the logical unit just finished loading/unloading, do a TUR */ if (cd->device->can_power_off && cd->dbml && sr_unit_load_done(cd)) { events = 0;