public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20250725015818.171252-5-dlemoal@kernel.org
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Damien Le Moal 2025-07-25 10:58:17 +09:00 • committed by Martin K. Petersen
parent bd31394aab
commit 704ed03abf
2 changed files with 75 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
drivers/scsi/libsas/sas_internal.h
View file

@ -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_ */

68
include/scsi/sas_ata.h
View file

@ -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