ide: drop dsc_handle argument from ide_pc_intr()

* Add 'int dsc' argument to ->pc_callback method.

* Call ide_tape_handle_dsc() internally in ide_tape_callback()
  if dsc argument is set and update ide_pc_intr() accordingly.

There should be no functional changes caused by this patch.

Cc: Borislav Petkov <petkovbb@gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/ide.h b/include/linux/ide.h
index a9d82d6e6bdd..93fd2bc17bf8 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -485,7 +485,7 @@ struct ide_drive_s {
         struct completion gendev_rel_comp;      /* to deal with device release() */
 
         /* callback for packet commands */
-        void (*pc_callback)(struct ide_drive_s *);
+        void (*pc_callback)(struct ide_drive_s *, int);
 
         unsigned long atapi_flags;
 };
@@ -1174,7 +1174,7 @@ int ide_set_media_lock(ide_drive_t *, struct gendisk *, int);
 ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,
         ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry,
         void (*update_buffers)(ide_drive_t *, struct ide_atapi_pc *),
-        void (*retry_pc)(ide_drive_t *), void (*dsc_handle)(ide_drive_t *),
+        void (*retry_pc)(ide_drive_t *),
         int (*io_buffers)(ide_drive_t *, struct ide_atapi_pc *, unsigned int,
                            int));
 ide_startstop_t ide_transfer_pc(ide_drive_t *, struct ide_atapi_pc *,