Merge tag 'for-linus-20170904' of git://git.infradead.org/linux-mtd

[linux-2.6-microblaze.git] / drivers / scsi / libsas / sas_internal.h

diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h
index a216c95..c07e081 100644 (file)
--- a/drivers/scsi/libsas/sas_internal.h
+++ b/drivers/scsi/libsas/sas_internal.h
@@ -81,6 +81,8 @@ int sas_queue_work(struct sas_ha_struct *ha, struct sas_work *sw);
 int sas_notify_lldd_dev_found(struct domain_device *);
 void sas_notify_lldd_dev_gone(struct domain_device *);
 
+void sas_smp_handler(struct bsg_job *job, struct Scsi_Host *shost,
+               struct sas_rphy *rphy);
 int sas_smp_phy_control(struct domain_device *dev, int phy_id,
                        enum phy_func phy_func, struct sas_phy_linkrates *);
 int sas_smp_get_phy_events(struct sas_phy *phy);
@@ -98,16 +100,14 @@ void sas_hae_reset(struct work_struct *work);
 void sas_free_device(struct kref *kref);
 
 #ifdef CONFIG_SCSI_SAS_HOST_SMP
-extern int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,
-                               struct request *rsp);
+extern void sas_smp_host_handler(struct bsg_job *job, struct Scsi_Host *shost);
 #else
-static inline int sas_smp_host_handler(struct Scsi_Host *shost,
-                                      struct request *req,
-                                      struct request *rsp)
+static inline void sas_smp_host_handler(struct bsg_job *job,
+               struct Scsi_Host *shost)
 {
        shost_printk(KERN_ERR, shost,
                "Cannot send SMP to a sas host (not enabled in CONFIG)\n");
-       return -EINVAL;
+       bsg_job_done(job, -EINVAL, 0);
 }
 #endif