aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi/libsas.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/scsi/libsas.h')
-rw-r--r--include/scsi/libsas.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 2079b18467a1..55bab8633807 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -192,6 +192,7 @@ struct domain_device {
192 struct domain_device *parent; 192 struct domain_device *parent;
193 struct list_head siblings; /* devices on the same level */ 193 struct list_head siblings; /* devices on the same level */
194 struct asd_sas_port *port; /* shortcut to root of the tree */ 194 struct asd_sas_port *port; /* shortcut to root of the tree */
195 struct sas_phy *phy;
195 196
196 struct list_head dev_list_node; 197 struct list_head dev_list_node;
197 struct list_head disco_list_node; /* awaiting probe or destruct */ 198 struct list_head disco_list_node; /* awaiting probe or destruct */
@@ -243,7 +244,6 @@ struct asd_sas_port {
243 struct list_head destroy_list; 244 struct list_head destroy_list;
244 enum sas_linkrate linkrate; 245 enum sas_linkrate linkrate;
245 246
246 struct sas_phy *phy;
247 struct work_struct work; 247 struct work_struct work;
248 248
249/* public: */ 249/* public: */
@@ -429,6 +429,11 @@ static inline unsigned int to_sas_gpio_od(int device, int bit)
429 return 3 * device + bit; 429 return 3 * device + bit;
430} 430}
431 431
432static inline void sas_put_local_phy(struct sas_phy *phy)
433{
434 put_device(&phy->dev);
435}
436
432#ifdef CONFIG_SCSI_SAS_HOST_SMP 437#ifdef CONFIG_SCSI_SAS_HOST_SMP
433int try_test_sas_gpio_gp_bit(unsigned int od, u8 *data, u8 index, u8 count); 438int try_test_sas_gpio_gp_bit(unsigned int od, u8 *data, u8 index, u8 count);
434#else 439#else
@@ -684,7 +689,7 @@ extern int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
684 689
685extern void sas_ssp_task_response(struct device *dev, struct sas_task *task, 690extern void sas_ssp_task_response(struct device *dev, struct sas_task *task,
686 struct ssp_response_iu *iu); 691 struct ssp_response_iu *iu);
687struct sas_phy *sas_find_local_phy(struct domain_device *dev); 692struct sas_phy *sas_get_local_phy(struct domain_device *dev);
688 693
689int sas_request_addr(struct Scsi_Host *shost, u8 *addr); 694int sas_request_addr(struct Scsi_Host *shost, u8 *addr);
690 695