From patchwork Mon Oct 30 16:02:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10032861 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1781D60291 for ; Mon, 30 Oct 2017 16:02:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F423F279E0 for ; Mon, 30 Oct 2017 16:02:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8AE1285B5; Mon, 30 Oct 2017 16:02:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4199E279E0 for ; Mon, 30 Oct 2017 16:02:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932291AbdJ3QCf (ORCPT ); Mon, 30 Oct 2017 12:02:35 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:47054 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932370AbdJ3QCV (ORCPT ); Mon, 30 Oct 2017 12:02:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1509379341; x=1540915341; h=from:to:cc:subject:date:message-id:mime-version; bh=YdgzC3WN7y1nE6BaGRiE53NFh4noaenwg+zlEhTGBeA=; b=TdtQxQlAWhl3f/g+Hr3sJz6W5yFphC8qoG1Ak3AAwDBNlKrbuPSKk/IW OqQHMRqaT5zBb6Joc5MQc3pMu044kWkOW2QgMOOF0yFC3pZzGLHDkAwU1 Bgg828FkgrmnW3XdASYipAB5v47ckoPaG+ijE31JfWixb5JG/cO7ELjrq DXSnZFkG0aoBthoOGEt4RKATIayXfO7abvCPqe/y0lftqRp25xthvnPBr 2OwN6j6172HGlQdTTFqmaLCPEW4A8LzMaL6y8BZbNHIR2bAbXg/qlZfs/ 664pfklxyMv+mGqKl9bSIjEcr2uuaR1JpzPPCFHhVFu03WDjNGRYituqB g==; X-IronPort-AV: E=Sophos;i="5.44,320,1505750400"; d="scan'208";a="60126986" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 31 Oct 2017 00:02:21 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP; 30 Oct 2017 09:00:30 -0700 Received: from unknown (HELO MILHUBIP03.sdcorp.global.sandisk.com) ([10.177.9.96]) by uls-op-cesaip02.wdc.com with ESMTP; 30 Oct 2017 09:02:21 -0700 Received: from milsmgip11.sandisk.com (10.177.8.100) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.319.2; Mon, 30 Oct 2017 09:02:21 -0700 X-AuditID: 0ab10959-097ff70000002c97-7d-59f74d0b1705 Received: from thinkpad-bart.int.fusionio.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id ED.2B.11415.B0D47F95; Mon, 30 Oct 2017 09:02:20 -0700 (PDT) From: Bart Van Assche To: Jens Axboe CC: , Christoph Hellwig , "Bart Van Assche" , Hannes Reinecke , "Johannes Thumshirn" Subject: [PATCH] block: Rework drivers/cdrom/Makefile Date: Mon, 30 Oct 2017 09:02:19 -0700 Message-ID: <20171030160219.13019-1-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.14.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkuLIzCtJLcpLzFFi42Lh2siRosvj+z3SYGOXosXqu/1sFpf+fGG0 2LNoEpPFytVHmSwed81gtdh7S9uBzePy2VKP3Tcb2Dw2n672+LxJzqP9QDdTAGsUl01Kak5m WWqRvl0CV8b9Va+ZCjYrVJyY/JS9gXGaVBcjJ4eEgInE2iV7WLoYuTiEBFYzSkx4/ZANJMEm oCdxat4+JhBbREBBouf3SjaQImaBXYwS6zc1sHYxcnAIC5hK/LutBWKyCKhKHJgZD1LOK2At 0fd6NjvEfHmJ9wvuM05g5FzAyLCKUSw3M6c4Nz2zwNBQrzgxLyWzOFsvOT93EyPYy5yROxif TjQ/xMjEwSnVwLhv4dmHs7/LHTIpVfgfXZexVNbuesTentcqX/74HLdu3/2x+sG7Xpl+E1H/ hU2sG76mKGrtLNhbcfTDAg/F+hl6v75p9eifenPDjifbWbtBZFFytNiiS9wmazVOpVwUW1Pm ubaWU/hk7PZti2Zws5oYNu+x3L77dOHfz3+7Xl5uVCj4lDf7XLoSS3FGoqEWc1FxIgAij10w ogEAAA== MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of referring from inside drivers/cdrom/Makefile to all the drivers that use this driver, let these drivers select the cdrom driver. This change makes the cdrom build code follow the approach that is used for most other drivers, namely refer from the higher layers to the lower layer instead of from the lower layer to the higher layers. Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: Johannes Thumshirn Reviewed-by: Hannes Reinecke --- drivers/block/Kconfig | 12 ++++++++++++ drivers/block/paride/Kconfig | 1 + drivers/cdrom/Makefile | 15 ++------------- drivers/ide/Kconfig | 1 + drivers/scsi/Kconfig | 1 + 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 4a438b8abe27..b998b3c9ea86 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -67,9 +67,20 @@ config AMIGA_Z2RAM To compile this driver as a module, choose M here: the module will be called z2ram. +config CDROM + tristate "CD-ROM driver" + help + A CD-ROM is a pre-pressed optical compact disc which contains + data. The name is an acronym which stands for "Compact Disc + Read-Only Memory". This driver implements functionality that is + shared by all CD-ROM drivers, e.g. the IDE CD-ROM driver and the + SCSI CD-ROM driver. For a list of the ioctls implemented by this + driver, see also Documentation/ioctl/cdrom.txt. + config GDROM tristate "SEGA Dreamcast GD-ROM drive" depends on SH_DREAMCAST + select CDROM select BLK_SCSI_REQUEST # only for the generic cdrom code help A standard SEGA Dreamcast comes with a modified CD ROM drive called a @@ -347,6 +358,7 @@ config BLK_DEV_RAM_DAX config CDROM_PKTCDVD tristate "Packet writing on CD/DVD media (DEPRECATED)" depends on !UML + select CDROM select BLK_SCSI_REQUEST help Note: This driver is deprecated and will be removed from the diff --git a/drivers/block/paride/Kconfig b/drivers/block/paride/Kconfig index 3a15247942e4..1d5057f5080b 100644 --- a/drivers/block/paride/Kconfig +++ b/drivers/block/paride/Kconfig @@ -25,6 +25,7 @@ config PARIDE_PD config PARIDE_PCD tristate "Parallel port ATAPI CD-ROMs" depends on PARIDE + select CDROM select BLK_SCSI_REQUEST # only for the generic cdrom code ---help--- This option enables the high-level driver for ATAPI CD-ROM devices diff --git a/drivers/cdrom/Makefile b/drivers/cdrom/Makefile index 8ffde4f8ab9a..7f3f43cc2257 100644 --- a/drivers/cdrom/Makefile +++ b/drivers/cdrom/Makefile @@ -1,13 +1,2 @@ -# Makefile for the kernel cdrom device drivers. -# -# 30 Jan 1998, Michael Elizabeth Chastain, -# Rewritten to use lists instead of if-statements. - -# Each configuration option enables a list of files. - -obj-$(CONFIG_BLK_DEV_IDECD) += cdrom.o -obj-$(CONFIG_BLK_DEV_SR) += cdrom.o -obj-$(CONFIG_PARIDE_PCD) += cdrom.o -obj-$(CONFIG_CDROM_PKTCDVD) += cdrom.o - -obj-$(CONFIG_GDROM) += gdrom.o cdrom.o +obj-$(CONFIG_CDROM) += cdrom.o +obj-$(CONFIG_GDROM) += gdrom.o diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index c99a25c075bc..7b92c591e4c1 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -118,6 +118,7 @@ config BLK_DEV_DELKIN config BLK_DEV_IDECD tristate "Include IDE/ATAPI CDROM support" select IDE_ATAPI + select CDROM ---help--- If you have a CD-ROM drive using the ATAPI protocol, say Y. ATAPI is a newer protocol used by IDE CD-ROM and TAPE drives, similar to the diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 41366339b950..cca0b03c2ead 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -131,6 +131,7 @@ config CHR_DEV_OSST config BLK_DEV_SR tristate "SCSI CDROM support" depends on SCSI + select CDROM ---help--- If you want to use a CD or DVD drive attached to your computer by SCSI, FireWire, USB or ATAPI, say Y and read the SCSI-HOWTO