sched: cleanup, remove the TASK_NONINTERACTIVE flag

[linux-2.6-omap-h63xx.git] / include / scsi / scsi_host.h

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 68f461b7a8355401330a42b35f52aba9393e10db..3b8a6a85c2f818e64435968136472fa7d2317bc1 100644 (file)
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -338,16 +338,10 @@ struct scsi_host_template {
         */
        enum scsi_eh_timer_return (* eh_timed_out)(struct scsi_cmnd *);
 
-       /*
-        * suspend support
-        */
-       int (*resume)(struct scsi_device *);
-       int (*suspend)(struct scsi_device *, pm_message_t state);
-
        /*
         * Name of proc directory
         */
-       char *proc_name;
+       const char *proc_name;
 
        /*
         * Used to store the procfs directory if a driver implements the
@@ -677,6 +671,10 @@ struct Scsi_Host {
 #define shost_printk(prefix, shost, fmt, a...) \
        dev_printk(prefix, &(shost)->shost_gendev, fmt, ##a)
 
+static inline void *shost_priv(struct Scsi_Host *shost)
+{
+       return (void *)shost->hostdata;
+}
 
 int scsi_is_host_device(const struct device *);