From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Denis Efremov <efremov@linux.com>,
"David S. Miller" <davem@davemloft.net>,
Song Liu <song@kernel.org>, Al Viro <viro@zeniv.linux.org.uk>,
Finn Thain <fthain@telegraphics.com.au>,
Michael Schmitz <schmitzmic@gmail.com>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-ide@vger.kernel.org, linux-raid@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-m68k@lists.linux-m68k.org
Subject: [PATCH 13/19] ide: switch to __register_blkdev for command set probing
Date: Thu, 3 Sep 2020 10:01:13 +0200 [thread overview]
Message-ID: <20200903080119.441674-14-hch@lst.de> (raw)
In-Reply-To: <20200903080119.441674-1-hch@lst.de>
ide is the last user of the blk_register_region framework except for the
tracking of allocated gendisk. Switch to __register_blkdev, even if that
doesn't allow us to trivially find out which command set to probe for.
That means we now always request all modules when a user tries to access
an unclaimed ide device node, but except for a few potentially loaded
modules for a fringe use case of a deprecated and soon to be removed
driver that doesn't make a difference.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/ide/ide-probe.c | 34 ++++++----------------------------
1 file changed, 6 insertions(+), 28 deletions(-)
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 076d34b381720f..1c1567bb519429 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -902,31 +902,12 @@ static int init_irq (ide_hwif_t *hwif)
return 1;
}
-static int ata_lock(dev_t dev, void *data)
+static void ata_probe(dev_t dev)
{
- /* FIXME: we want to pin hwif down */
- return 0;
-}
-
-static struct kobject *ata_probe(dev_t dev, int *part, void *data)
-{
- ide_hwif_t *hwif = data;
- int unit = *part >> PARTN_BITS;
- ide_drive_t *drive = hwif->devices[unit];
-
- if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
- return NULL;
-
- if (drive->media == ide_disk)
- request_module("ide-disk");
- if (drive->media == ide_cdrom || drive->media == ide_optical)
- request_module("ide-cd");
- if (drive->media == ide_tape)
- request_module("ide-tape");
- if (drive->media == ide_floppy)
- request_module("ide-floppy");
-
- return NULL;
+ request_module("ide-disk");
+ request_module("ide-cd");
+ request_module("ide-tape");
+ request_module("ide-floppy");
}
void ide_init_disk(struct gendisk *disk, ide_drive_t *drive)
@@ -967,7 +948,7 @@ static int hwif_init(ide_hwif_t *hwif)
return 0;
}
- if (register_blkdev(hwif->major, hwif->name))
+ if (__register_blkdev(hwif->major, hwif->name, ata_probe))
return 0;
if (!hwif->sg_max_nents)
@@ -989,8 +970,6 @@ static int hwif_init(ide_hwif_t *hwif)
goto out;
}
- blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS,
- THIS_MODULE, ata_probe, ata_lock, hwif);
return 1;
out:
@@ -1582,7 +1561,6 @@ static void ide_unregister(ide_hwif_t *hwif)
/*
* Remove us from the kernel's knowledge
*/
- blk_unregister_region(MKDEV(hwif->major, 0), MAX_DRIVES<<PARTN_BITS);
kfree(hwif->sg_table);
unregister_blkdev(hwif->major, hwif->name);
--
2.28.0
next prev parent reply other threads:[~2020-09-03 8:14 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 8:01 simplify gendisk lookup and remove struct block_device aliases v3 Christoph Hellwig
2020-09-03 8:01 ` [PATCH 01/19] char_dev: replace cdev_map with an xarray Christoph Hellwig
2020-09-04 10:16 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 02/19] block: merge drivers/base/map.c into block/genhd.c Christoph Hellwig
2020-09-04 10:17 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 03/19] block: cleanup del_gendisk a bit Christoph Hellwig
2020-09-04 10:18 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 04/19] block: split block_class_lock Christoph Hellwig
2020-09-04 10:19 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 05/19] block: rework requesting modules for unclaimed devices Christoph Hellwig
2020-09-04 10:20 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 06/19] block: add an optional probe callback to major_names Christoph Hellwig
2020-09-04 10:20 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 07/19] ide: remove ide_{,un}register_region Christoph Hellwig
2020-09-03 8:01 ` [PATCH 08/19] swim: don't call blk_register_region Christoph Hellwig
2020-09-04 10:21 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 09/19] sd: use __register_blkdev to avoid a modprobe for an unregistered dev_t Christoph Hellwig
2020-09-04 10:22 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 10/19] brd: use __register_blkdev to allocate devices on demand Christoph Hellwig
2020-09-04 10:23 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 11/19] loop: " Christoph Hellwig
2020-09-04 10:24 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 12/19] md: " Christoph Hellwig
2020-09-04 10:25 ` Hannes Reinecke
2020-09-03 8:01 ` Christoph Hellwig [this message]
2020-09-04 10:26 ` [PATCH 13/19] ide: switch to __register_blkdev for command set probing Hannes Reinecke
2020-09-03 8:01 ` [PATCH 14/19] floppy: use a separate gendisk for each media format Christoph Hellwig
2020-09-04 9:59 ` Denis Efremov
2020-09-04 10:28 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 15/19] amiflop: use separate gendisks for Amiga vs MS-DOS mode Christoph Hellwig
2020-09-04 10:28 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 16/19] ataflop: use a separate gendisk for each media format Christoph Hellwig
2020-09-03 8:14 ` John Paul Adrian Glaubitz
2020-09-04 10:29 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 17/19] z2ram: reindent Christoph Hellwig
2020-09-04 10:29 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 18/19] z2ram: use separate gendisk for the different modes Christoph Hellwig
2020-09-04 10:30 ` Hannes Reinecke
2020-09-03 8:01 ` [PATCH 19/19] block: switch gendisk lookup to a simple xarray Christoph Hellwig
2020-09-04 10:30 ` Hannes Reinecke
-- strict thread matches above, loose matches on Subject: below --
2020-08-30 6:24 simplify gendisk lookup and remove struct block_device aliases v2 Christoph Hellwig
2020-08-30 6:24 ` [PATCH 13/19] ide: switch to __register_blkdev for command set probing Christoph Hellwig
2020-08-26 6:24 simplify gendisk lookup and remove struct block_device aliases Christoph Hellwig
2020-08-26 6:24 ` [PATCH 13/19] ide: switch to __register_blkdev for command set probing Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200903080119.441674-14-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=davem@davemloft.net \
--cc=efremov@linux.com \
--cc=fthain@telegraphics.com.au \
--cc=gregkh@linuxfoundation.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=schmitzmic@gmail.com \
--cc=song@kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).