scsi_dh: kill struct scsi_dh_data

Add a ->handler and a ->handler_data field to struct scsi_device and kill
this indirection.  Also move struct scsi_device_handler to scsi_dh.h so that
changes to it don't require rebuilding every SCSI LLDD.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

2 files changed, 20 insertions, 22 deletions

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 4d501b7baa9b..fe89d7cd67b9 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -196,32 +196,13 @@ struct scsi_device {
         struct execute_work     ew; /* used to get process context on put */
         struct work_struct      requeue_work;
 
-        struct scsi_dh_data     *scsi_dh_data;
+        struct scsi_device_handler *handler;
+        void                    *handler_data;
+
         enum scsi_device_state sdev_state;
         unsigned long           sdev_data[0];
 } __attribute__((aligned(sizeof(unsigned long))));
 
-typedef void (*activate_complete)(void *, int);
-struct scsi_device_handler {
-        /* Used by the infrastructure */
-        struct list_head list; /* list of scsi_device_handlers */
-
-        /* Filled by the hardware handler */
-        struct module *module;
-        const char *name;
-        int (*check_sense)(struct scsi_device *, struct scsi_sense_hdr *);
-        struct scsi_dh_data *(*attach)(struct scsi_device *);
-        void (*detach)(struct scsi_device *);
-        int (*activate)(struct scsi_device *, activate_complete, void *);
-        int (*prep_fn)(struct scsi_device *, struct request *);
-        int (*set_params)(struct scsi_device *, const char *);
-};
-
-struct scsi_dh_data {
-        struct scsi_device_handler *scsi_dh;
-        struct scsi_device *sdev;
-};
-
 #define to_scsi_device(d)       \
         container_of(d, struct scsi_device, sdev_gendev)
 #define class_to_sdev(d)        \
diff --git a/include/scsi/scsi_dh.h b/include/scsi/scsi_dh.h
index 3a37b4c45997..85d731746834 100644
--- a/include/scsi/scsi_dh.h
+++ b/include/scsi/scsi_dh.h
@@ -55,6 +55,23 @@ enum {
         SCSI_DH_NOSYS,
         SCSI_DH_DRIVER_MAX,
 };
+
+typedef void (*activate_complete)(void *, int);
+struct scsi_device_handler {
+        /* Used by the infrastructure */
+        struct list_head list; /* list of scsi_device_handlers */
+
+        /* Filled by the hardware handler */
+        struct module *module;
+        const char *name;
+        int (*check_sense)(struct scsi_device *, struct scsi_sense_hdr *);
+        int (*attach)(struct scsi_device *);
+        void (*detach)(struct scsi_device *);
+        int (*activate)(struct scsi_device *, activate_complete, void *);
+        int (*prep_fn)(struct scsi_device *, struct request *);
+        int (*set_params)(struct scsi_device *, const char *);
+};
+
 #ifdef CONFIG_SCSI_DH
 extern int scsi_dh_activate(struct request_queue *, activate_complete, void *);
 extern int scsi_dh_attach(struct request_queue *, const char *);