Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0a0c4114df4a6903bccb65b06cabb6ddc968f877

Authored by Akinobu Mita
Committed by Jens Axboe
1 parent 7fd097d42b
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

cdrom: make unregister_cdrom() return void 

Now unregister_cdrom() always returns 0.
Make it return void and update all callers that check the return value.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

Showing 6 changed files with 9 additions and 12 deletions Side-by-side Diff

Documentation/cdrom/cdrom-standard.tex
Diff comments   View file @ 0a0c411
... ... @@ -777,7 +777,7 @@
777 777 it may have as many structures $<device>_info$ as there are minor devices
778 778 active. $Register_cdrom()$ builds a linked list from these.
779 779  
780   -\subsection{$Int\ unregister_cdrom(struct\ cdrom_device_info * cdi)$}
  780 +\subsection{$Void\ unregister_cdrom(struct\ cdrom_device_info * cdi)$}
781 781  
782 782 Unregistering device $cdi$ with minor number $MINOR(cdi\to dev)$ removes
783 783 the minor device from the list. If it was the last registered minor for
drivers/cdrom/cdrom.c
Diff comments   View file @ 0a0c411
... ... @@ -442,7 +442,7 @@
442 442 }
443 443 #undef ENSURE
444 444  
445   -int unregister_cdrom(struct cdrom_device_info *cdi)
  445 +void unregister_cdrom(struct cdrom_device_info *cdi)
446 446 {
447 447 cdinfo(CD_OPEN, "entering unregister_cdrom\n");
448 448  
... ... @@ -455,7 +455,6 @@
455 455  
456 456 cdi->ops->n_minors--;
457 457 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
458   - return 0;
459 458 }
460 459  
461 460 int cdrom_get_media_event(struct cdrom_device_info *cdi,
drivers/cdrom/gdrom.c
Diff comments   View file @ 0a0c411
... ... @@ -827,7 +827,9 @@
827 827 del_gendisk(gd.disk);
828 828 if (gdrom_major)
829 829 unregister_blkdev(gdrom_major, GDROM_DEV_NAME);
830   - return unregister_cdrom(gd.cd_info);
  830 + unregister_cdrom(gd.cd_info);
  831 +
  832 + return 0;
831 833 }
832 834  
833 835 static struct platform_driver gdrom_driver = {
drivers/cdrom/viocd.c
Diff comments   View file @ 0a0c411
... ... @@ -650,10 +650,7 @@
650 650 {
651 651 struct disk_info *d = &viocd_diskinfo[vdev->unit_address];
652 652  
653   - if (unregister_cdrom(&d->viocd_info) != 0)
654   - printk(VIOCD_KERN_WARNING
655   - "Cannot unregister viocd CD-ROM %s!\n",
656   - d->viocd_info.name);
  653 + unregister_cdrom(&d->viocd_info);
657 654 del_gendisk(d->viocd_disk);
658 655 blk_cleanup_queue(d->viocd_disk->queue);
659 656 put_disk(d->viocd_disk);
drivers/ide/ide-cd.c
Diff comments   View file @ 0a0c411
... ... @@ -2032,9 +2032,8 @@
2032 2032  
2033 2033 kfree(info->buffer);
2034 2034 kfree(info->toc);
2035   - if (devinfo->handle == drive && unregister_cdrom(devinfo))
2036   - printk(KERN_ERR "%s: %s failed to unregister device from the cdrom "
2037   - "driver.\n", __FUNCTION__, drive->name);
  2035 + if (devinfo->handle == drive)
  2036 + unregister_cdrom(devinfo);
2038 2037 drive->dsc_overlap = 0;
2039 2038 drive->driver_data = NULL;
2040 2039 blk_queue_prep_rq(drive->queue, NULL);
include/linux/cdrom.h
Diff comments   View file @ 0a0c411
... ... @@ -995,7 +995,7 @@
995 995 extern int cdrom_media_changed(struct cdrom_device_info *);
996 996  
997 997 extern int register_cdrom(struct cdrom_device_info *cdi);
998   -extern int unregister_cdrom(struct cdrom_device_info *cdi);
  998 +extern void unregister_cdrom(struct cdrom_device_info *cdi);
999 999  
1000 1000 typedef struct {
1001 1001 int data;