* [PATCH 01/23] add register_chrdev_ids() to char_dev.c, API
[not found] <1305840792-25877-1-git-send-email-jim.cromie@gmail.com>
@ 2011-05-19 21:33 ` Jim Cromie
2011-05-19 21:33 ` [PATCH 08/23] use register_chrdev_ids in drivers/scsi/ Jim Cromie
1 sibling, 0 replies; 5+ messages in thread
From: Jim Cromie @ 2011-05-19 21:33 UTC (permalink / raw)
To: linux-kernel
Cc: Anil Ravindranath, linux-sh, Heiko Carstens, Hans J. Koch,
linux-mtd, Sean Hefty, devel, linux-s390, David Brownell,
linux-scsi, linux-rdma, Paul Mundt, linux-input, osst-users,
Hal Rosenstock, linux-media, Doug Gilbert, Roland Dreier,
rtc-linux, Matthew Wilcox, Boaz Harrosh, Chris Metcalf,
Mauro Carvalho Chehab, Martin Schwidefsky,
subscribers-only <linuxp>
register_chrdev_ids() replaces and deprecates register_chrdev_region()
and alloc_chrdev_region() with a single function that works for both
dynamic and static major numbers.
Like alloc_chrdev_region(), 1st arg is a dev_t*, but its an in/out
parameter, and expects both major and minor to be preset, and thus the
separate minor arg is dropped. If major == 0, a dynamic major is
reserved, saved into 1st arg, and thus available to caller afterwards.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
cc: Alessandro Zummo <a.zummo@towertech.it>
cc: Alexander Viro <viro@zeniv.linux.org.uk>
cc: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
cc: Benny Halevy <bhalevy@panasas.com>
cc: Boaz Harrosh <bharrosh@panasas.com>
cc: Chris Metcalf <cmetcalf@tilera.com>
cc: David Brownell <dbrownell@users.sourceforge.net>
cc: "David S. Miller" <davem@davemloft.net>
cc: David Woodhouse <dwmw2@infradead.org>
cc: devel@driverdev.osuosl.org
cc: Doug Gilbert <dgilbert@interlog.com>
cc: Greg Kroah-Hartman <gregkh@suse.de>
cc: Hal Rosenstock <hal.rosenstock@gmail.com>
cc: "Hans J. Koch" <hjk@hansjkoch.de>
cc: Heiko Carstens <heiko.carstens@de.ibm.com>
cc: Jens Axboe <axboe@kernel.dk>
cc: Jim Cromie <jim.cromie@gmail.com>
cc: Jiri Kosina <jkosina@suse.cz>
cc: Jiri Slaby <jirislaby@gmail.com>
cc: linux390@de.ibm.com
cc: linux-fsdevel@vger.kernel.org
cc: linux-input@vger.kernel.org
cc: linux-kernel@vger.kernel.org
cc: linux-media@vger.kernel.org
cc: linux-mtd@lists.infradead.org
cc: linuxpps@ml.enneenne.com (subscribers-only)
cc: linux-rdma@vger.kernel.org
cc: linux-s390@vger.kernel.org
cc: linux-scsi@vger.kernel.org
cc: linux-sh@vger.kernel.org
cc: linux-usb@vger.kernel.org
cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
cc: Matthew Wilcox <matthew@wil.cx>
cc: Mauro Carvalho Chehab <mchehab@infradead.org>
cc: netdev@vger.kernel.org
cc: osd-dev@open-osd.org
cc: osst-users@lists.sourceforge.net
cc: Paul Mundt <lethal@linux-sh.org>
cc: Rodolfo Giometti <giometti@enneenne.com>
cc: Roland Dreier <roland@kernel.org>
cc: rtc-linux@googlegroups.com
cc: Sean Hefty <sean.hefty@intel.com>
cc: Willem Riede <osst@riede.org>
---
fs/char_dev.c | 33 +++++++++++++++++++++++++++++----
include/linux/fs.h | 6 ++++--
2 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/fs/char_dev.c b/fs/char_dev.c
index dca9e5e..9149b7c 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -93,7 +93,7 @@ void chrdev_show(struct seq_file *f, off_t offset)
*/
static struct char_device_struct *
__register_chrdev_region(unsigned int major, unsigned int baseminor,
- int minorct, const char *name)
+ int minorct, const char *name)
{
struct char_device_struct *cd, **cp;
int ret = 0;
@@ -193,7 +193,8 @@ __unregister_chrdev_region(unsigned major, unsigned baseminor, int minorct)
*
* Return value is zero on success, a negative error code on failure.
*/
-int register_chrdev_region(dev_t from, unsigned count, const char *name)
+int __deprecated
+register_chrdev_region(dev_t from, unsigned count, const char *name)
{
struct char_device_struct *cd;
dev_t to = from + count;
@@ -229,8 +230,9 @@ fail:
* chosen dynamically, and returned (along with the first minor number)
* in @dev. Returns zero or a negative error code.
*/
-int alloc_chrdev_region(dev_t *dev, unsigned baseminor, unsigned count,
- const char *name)
+int __deprecated
+alloc_chrdev_region(dev_t *dev, unsigned baseminor, unsigned count,
+ const char *name)
{
struct char_device_struct *cd;
cd = __register_chrdev_region(0, baseminor, count, name);
@@ -241,6 +243,28 @@ int alloc_chrdev_region(dev_t *dev, unsigned baseminor, unsigned count,
}
/**
+ * register_chrdev_ids() - register a range of char device numbers
+ * @dev: in/output parameter for requested/claimed device major, minor
+ * @count: the number of minor numbers required
+ * @name: the name of the associated device or driver
+ *
+ * Allocates a range of char device numbers. The major number will be
+ * chosen dynamically if passed as 0, or reserved specifically otherwize,
+ * with reserved numbers written into @dev.
+ * Returns zero, or a negative error code.
+ */
+int register_chrdev_ids(dev_t *dev, unsigned count, const char *name)
+{
+ struct char_device_struct *cd;
+
+ cd = __register_chrdev_region(MAJOR(*dev), MINOR(*dev), count, name);
+ if (IS_ERR(cd))
+ return PTR_ERR(cd);
+ *dev = MKDEV(cd->major, cd->baseminor);
+ return 0;
+}
+
+/**
* __register_chrdev() - create and register a cdev occupying a range of minors
* @major: major device number or 0 for dynamic allocation
* @baseminor: first of the requested range of minor numbers
@@ -566,6 +590,7 @@ void __init chrdev_init(void)
EXPORT_SYMBOL(register_chrdev_region);
EXPORT_SYMBOL(unregister_chrdev_region);
EXPORT_SYMBOL(alloc_chrdev_region);
+EXPORT_SYMBOL(register_chrdev_ids);
EXPORT_SYMBOL(cdev_init);
EXPORT_SYMBOL(cdev_alloc);
EXPORT_SYMBOL(cdev_del);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index cdf9495..e72de48 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2075,8 +2075,10 @@ static inline void bd_unlink_disk_holder(struct block_device *bdev,
/* fs/char_dev.c */
#define CHRDEV_MAJOR_HASH_SIZE 255
-extern int alloc_chrdev_region(dev_t *, unsigned, unsigned, const char *);
-extern int register_chrdev_region(dev_t, unsigned, const char *);
+extern int register_chrdev_ids(dev_t *, unsigned, const char *);
+extern int __deprecated alloc_chrdev_region(dev_t *, unsigned, unsigned,
+ const char *);
+extern int __deprecated register_chrdev_region(dev_t, unsigned, const char *);
extern int __register_chrdev(unsigned int major, unsigned int baseminor,
unsigned int count, const char *name,
const struct file_operations *fops);
--
1.7.4.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 08/23] use register_chrdev_ids in drivers/scsi/
[not found] <1305840792-25877-1-git-send-email-jim.cromie@gmail.com>
2011-05-19 21:33 ` [PATCH 01/23] add register_chrdev_ids() to char_dev.c, API Jim Cromie
@ 2011-05-19 21:33 ` Jim Cromie
2011-05-20 15:42 ` Boaz Harrosh
1 sibling, 1 reply; 5+ messages in thread
From: Jim Cromie @ 2011-05-19 21:33 UTC (permalink / raw)
To: linux-kernel
Cc: gregkh, Jim Cromie, Doug Gilbert, linux-scsi, Benny Halevy,
Boaz Harrosh, osd-dev, Anil Ravindranath
cc: Doug Gilbert <dgilbert@interlog.com>
cc: linux-scsi@vger.kernel.org
cc: Benny Halevy <bhalevy@panasas.com>
cc: Boaz Harrosh <bharrosh@panasas.com>
cc: osd-dev@open-osd.org
cc: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
cc: linux-scsi@vger.kernel.org
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
drivers/scsi/osd/osd_uld.c | 6 +++---
drivers/scsi/pmcraid.c | 3 +--
drivers/scsi/sg.c | 6 +++---
drivers/scsi/st.c | 7 +++----
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
index b31a8e3..18dcd38 100644
--- a/drivers/scsi/osd/osd_uld.c
+++ b/drivers/scsi/osd/osd_uld.c
@@ -528,6 +528,7 @@ static struct scsi_driver osd_driver = {
static int __init osd_uld_init(void)
{
int err;
+ dev_t devt = MKDEV(SCSI_OSD_MAJOR, 0);
err = class_register(&osd_uld_class);
if (err) {
@@ -535,8 +536,7 @@ static int __init osd_uld_init(void)
return err;
}
- err = register_chrdev_region(MKDEV(SCSI_OSD_MAJOR, 0),
- SCSI_OSD_MAX_MINOR, osd_name);
+ err = register_chrdev_ids(&devt, SCSI_OSD_MAX_MINOR, osd_name);
if (err) {
OSD_ERR("Unable to register major %d for osd ULD => %d\n",
SCSI_OSD_MAJOR, err);
@@ -553,7 +553,7 @@ static int __init osd_uld_init(void)
return 0;
err_out_chrdev:
- unregister_chrdev_region(MKDEV(SCSI_OSD_MAJOR, 0), SCSI_OSD_MAX_MINOR);
+ unregister_chrdev_region(devt, SCSI_OSD_MAX_MINOR);
err_out:
class_unregister(&osd_uld_class);
return err;
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 7f636b1..61a2207 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -6100,8 +6100,7 @@ static int __init pmcraid_init(void)
PMCRAID_DRIVER_NAME,
PMCRAID_DRIVER_VERSION, PMCRAID_DRIVER_DATE);
- error = alloc_chrdev_region(&dev, 0,
- PMCRAID_MAX_ADAPTERS,
+ error = register_chrdev_ids(&dev, PMCRAID_MAX_ADAPTERS,
PMCRAID_DEVFILE);
if (error) {
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 909ed9e..e741988 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1575,6 +1575,7 @@ static int __init
init_sg(void)
{
int rc;
+ dev_t devt = MKDEV(SCSI_GENERIC_MAJOR, 0);
if (scatter_elem_sz < PAGE_SIZE) {
scatter_elem_sz = PAGE_SIZE;
@@ -1585,8 +1586,7 @@ init_sg(void)
else
def_reserved_size = sg_big_buff;
- rc = register_chrdev_region(MKDEV(SCSI_GENERIC_MAJOR, 0),
- SG_MAX_DEVS, "sg");
+ rc = register_chrdev_ids(&devt, SG_MAX_DEVS, "sg");
if (rc)
return rc;
sg_sysfs_class = class_create(THIS_MODULE, "scsi_generic");
@@ -1604,7 +1604,7 @@ init_sg(void)
}
class_destroy(sg_sysfs_class);
err_out:
- unregister_chrdev_region(MKDEV(SCSI_GENERIC_MAJOR, 0), SG_MAX_DEVS);
+ unregister_chrdev_region(devt, SG_MAX_DEVS);
return rc;
}
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 1871b8a..5cce227 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4260,6 +4260,7 @@ static void scsi_tape_release(struct kref *kref)
static int __init init_st(void)
{
int err;
+ dev_t devt = MKDEV(SCSI_TAPE_MAJOR, 0);
validate_options();
@@ -4272,8 +4273,7 @@ static int __init init_st(void)
return PTR_ERR(st_sysfs_class);
}
- err = register_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0),
- ST_MAX_TAPE_ENTRIES, "st");
+ err = register_chrdev_ids(&devt, ST_MAX_TAPE_ENTRIES, "st");
if (err) {
printk(KERN_ERR "Unable to get major %d for SCSI tapes\n",
SCSI_TAPE_MAJOR);
@@ -4293,8 +4293,7 @@ static int __init init_st(void)
err_scsidrv:
scsi_unregister_driver(&st_template.gendrv);
err_chrdev:
- unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0),
- ST_MAX_TAPE_ENTRIES);
+ unregister_chrdev_region(devt, ST_MAX_TAPE_ENTRIES);
err_class:
class_destroy(st_sysfs_class);
return err;
--
1.7.4.4
^ permalink raw reply related [flat|nested] 5+ messages in thread