Merge tag 'for-5.6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

[platform/kernel/linux-rpi.git] / drivers / block / pktcdvd.c

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 861fc65..5f970a7 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2663,28 +2663,6 @@ static int pkt_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
        return ret;
 }
 
-#ifdef CONFIG_COMPAT
-static int pkt_compat_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg)
-{
-       switch (cmd) {
-       /* compatible */
-       case CDROMEJECT:
-       case CDROMMULTISESSION:
-       case CDROMREADTOCENTRY:
-       case SCSI_IOCTL_SEND_COMMAND:
-               return pkt_ioctl(bdev, mode, cmd, (unsigned long)compat_ptr(arg));
-
-
-       /* FIXME: no handler so far */
-       case CDROM_LAST_WRITTEN:
-       /* handled in compat_blkdev_driver_ioctl */
-       case CDROM_SEND_PACKET:
-       default:
-               return -ENOIOCTLCMD;
-       }
-}
-#endif
-
 static unsigned int pkt_check_events(struct gendisk *disk,
                                     unsigned int clearing)
 {
@@ -2706,9 +2684,7 @@ static const struct block_device_operations pktcdvd_ops = {
        .open =                 pkt_open,
        .release =              pkt_close,
        .ioctl =                pkt_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl =         pkt_compat_ioctl,
-#endif
+       .compat_ioctl =         blkdev_compat_ptr_ioctl,
        .check_events =         pkt_check_events,
 };