register_blkdev() and __register_chrdev_region() treat the major number as an unsigned int. So print it the same way to avoid absurd error statements such as: "... major requested (-1) is greater than the maximum (511) ..." (and also fix off-by-one bugs in the error prints). While at it, also update the comment describing register_blkdev().
Unified · Split
| @@ -308,19 +308,22 @@ void blkdev_show(struct seq_file *seqf, off_t offset) · 307 unmodified lines | ||
| 308 | 308 | /** |
| 309 | 309 | * register_blkdev - register a new block device |
| 310 | 310 | * |
| 311 | − * @major: the requested major device number [1..255]. If @major = 0, try to | |
| 312 | − * allocate any unused major number. | |
| 311 | + * @major: the requested major device number [1..BLKDEV_MAJOR_MAX-1]. If | |
| 312 | + * @major = 0, try to allocate any unused major number. | |
| 313 | 313 | * @name: the name of the new block device as a zero terminated string |
| 314 | 314 | * |
| 315 | 315 | * The @name must be unique within the system. |
| 316 | 316 | * |
| 317 | 317 | * The return value depends on the @major input parameter: |
| 318 | 318 | * |
| 319 | − * - if a major device number was requested in range [1..255] then the | |
| 320 | − * function returns zero on success, or a negative error code | |
| 319 | + * - if a major device number was requested in range [1..BLKDEV_MAJOR_MAX-1] | |
| 320 | + * then the function returns zero on success, or a negative error code | |
| 321 | 321 | * - if any unused major number was requested with @major = 0 parameter |
| 322 | 322 | * then the return value is the allocated major number in range |
| 323 | − * [1..255] or a negative error code otherwise | |
| 323 | + * [1..BLKDEV_MAJOR_MAX-1] or a negative error code otherwise | |
| 324 | + * | |
| 325 | + * See Documentation/admin-guide/devices.txt for the list of allocated | |
| 326 | + * major numbers. | |
| 324 | 327 | */ |
| 325 | 328 | int register_blkdev(unsigned int major, const char *name) |
| 326 | 329 | { |
| @@ -347,8 +350,8 @@ int register_blkdev(unsigned int major, const char *name) · 20 unmodified lines | ||
| 347 | 350 | } |
| 348 | 351 | |
| 349 | 352 | if (major >= BLKDEV_MAJOR_MAX) { |
| 350 | − pr_err("register_blkdev: major requested (%d) is greater than the maximum (%d) for %s\n", | |
| 351 | − major, BLKDEV_MAJOR_MAX, name); | |
| 353 | + pr_err("register_blkdev: major requested (%u) is greater than the maximum (%u) for %s\n", | |
| 354 | + major, BLKDEV_MAJOR_MAX-1, name); | |
| 352 | 355 | |
| 353 | 356 | ret = -EINVAL; |
| 354 | 357 | goto out; |
| @@ -375,7 +378,7 @@ int register_blkdev(unsigned int major, const char *name) · 20 unmodified lines | ||
| 375 | 378 | ret = -EBUSY; |
| 376 | 379 | |
| 377 | 380 | if (ret < 0) { |
| 378 | − printk("register_blkdev: cannot get major %d for %s\n", | |
| 381 | + printk("register_blkdev: cannot get major %u for %s\n", | |
| 379 | 382 | major, name); |
| 380 | 383 | kfree(p); |
| 381 | 384 | } |
| @@ -121,8 +121,8 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor, · 120 unmodified lines | ||
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | if (major >= CHRDEV_MAJOR_MAX) { |
| 124 | − pr_err("CHRDEV \"%s\" major requested (%d) is greater than the maximum (%d)\n", | |
| 125 | − name, major, CHRDEV_MAJOR_MAX); | |
| 124 | + pr_err("CHRDEV \"%s\" major requested (%u) is greater than the maximum (%u)\n", | |
| 125 | + name, major, CHRDEV_MAJOR_MAX-1); | |
| 126 | 126 | ret = -EINVAL; |
| 127 | 127 | goto out; |
| 128 | 128 | } |