Commit 704ed03a authored by Damien Le Moal's avatar Damien Le Moal Committed by Martin K. Petersen
Browse files

scsi: libsas: Move declarations of internal functions to sas_internal.h 



Move the declaration of all functions used only within libsas from
include/scsi/sas_ata.h to drivers/scsi/libsas/sas_internal.h.

No functional changes.

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20250725015818.171252-5-dlemoal@kernel.org


Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent bd31394a

drivers/scsi/libsas/sas_internal.h

+74 −0
Original line number Diff line number Diff line
@@ -222,4 +222,78 @@ static inline void sas_put_device(struct domain_device *dev) 
	kref_put(&dev->kref, sas_free_device);

}



#ifdef CONFIG_SCSI_SAS_ATA



int sas_ata_init(struct domain_device *dev);

void sas_ata_task_abort(struct sas_task *task);

int sas_discover_sata(struct domain_device *dev);

int sas_ata_add_dev(struct domain_device *parent, struct ex_phy *phy,

		    struct domain_device *child, int phy_id);

void sas_ata_strategy_handler(struct Scsi_Host *shost);

void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q);

void sas_ata_end_eh(struct ata_port *ap);

void sas_ata_wait_eh(struct domain_device *dev);

void sas_probe_sata(struct asd_sas_port *port);

void sas_suspend_sata(struct asd_sas_port *port);

void sas_resume_sata(struct asd_sas_port *port);



#else



static inline int sas_ata_init(struct domain_device *dev)

{

	return 0;

}



static inline void sas_ata_task_abort(struct sas_task *task)

{

}



static inline void sas_ata_strategy_handler(struct Scsi_Host *shost)

{

}



static inline void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q)

{

}



static inline void sas_ata_end_eh(struct ata_port *ap)

{

}



static inline void sas_ata_wait_eh(struct domain_device *dev)

{

}



static inline void sas_probe_sata(struct asd_sas_port *port)

{

}



static inline void sas_suspend_sata(struct asd_sas_port *port)

{

}



static inline void sas_resume_sata(struct asd_sas_port *port)

{

}



static inline void sas_ata_disabled_notice(void)

{

	pr_notice_once("ATA device seen but CONFIG_SCSI_SAS_ATA=N\n");

}



static inline int sas_discover_sata(struct domain_device *dev)

{

	sas_ata_disabled_notice();

	return -ENXIO;

}



static inline int sas_ata_add_dev(struct domain_device *parent, struct ex_phy *phy,

				  struct domain_device *child, int phy_id)

{

	sas_ata_disabled_notice();

	return -ENODEV;

}



#endif



#endif /* _SAS_INTERNAL_H_ */

include/scsi/sas_ata.h

+1 −67
Original line number Diff line number Diff line
@@ -28,77 +28,24 @@ static inline bool dev_is_sata(struct domain_device *dev) 
	}

}



int sas_ata_init(struct domain_device *dev);

void sas_ata_task_abort(struct sas_task *task);

void sas_ata_strategy_handler(struct Scsi_Host *shost);

void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q);

void sas_ata_schedule_reset(struct domain_device *dev);

void sas_ata_wait_eh(struct domain_device *dev);

void sas_probe_sata(struct asd_sas_port *port);

void sas_suspend_sata(struct asd_sas_port *port);

void sas_resume_sata(struct asd_sas_port *port);

void sas_ata_end_eh(struct ata_port *ap);

void sas_ata_device_link_abort(struct domain_device *dev, bool force_reset);

int sas_execute_ata_cmd(struct domain_device *device, u8 *fis,

			int force_phy_id);

int sas_execute_ata_cmd(struct domain_device *device, u8 *fis, int force_phy_id);

int smp_ata_check_ready_type(struct ata_link *link);

int sas_discover_sata(struct domain_device *dev);

int sas_ata_add_dev(struct domain_device *parent, struct ex_phy *phy,

		    struct domain_device *child, int phy_id);



extern const struct attribute_group sas_ata_sdev_attr_group;



#else



static inline void sas_ata_disabled_notice(void)

{

	pr_notice_once("ATA device seen but CONFIG_SCSI_SAS_ATA=N\n");

}



static inline bool dev_is_sata(struct domain_device *dev)

{

	return false;

}

static inline int sas_ata_init(struct domain_device *dev)

{

	return 0;

}

static inline void sas_ata_task_abort(struct sas_task *task)

{

}



static inline void sas_ata_strategy_handler(struct Scsi_Host *shost)

{

}



static inline void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q)

{

}



static inline void sas_ata_schedule_reset(struct domain_device *dev)

{

}



static inline void sas_ata_wait_eh(struct domain_device *dev)

{

}



static inline void sas_probe_sata(struct asd_sas_port *port)

{

}



static inline void sas_suspend_sata(struct asd_sas_port *port)

{

}



static inline void sas_resume_sata(struct asd_sas_port *port)

{

}



static inline void sas_ata_end_eh(struct ata_port *ap)

{

}



static inline void sas_ata_device_link_abort(struct domain_device *dev,

					     bool force_reset)

{
@@ -115,19 +62,6 @@ static inline int smp_ata_check_ready_type(struct ata_link *link) 
	return 0;

}



static inline int sas_discover_sata(struct domain_device *dev)

{

	sas_ata_disabled_notice();

	return -ENXIO;

}



static inline int sas_ata_add_dev(struct domain_device *parent, struct ex_phy *phy,

				  struct domain_device *child, int phy_id)

{

	sas_ata_disabled_notice();

	return -ENODEV;

}



#define sas_ata_sdev_attr_group ((struct attribute_group) {})



#endif