Skip to content

Commit d10b11d

Browse files
damien-lemoalmartinkpetersen
authored andcommitted
scsi: libsas: Move local functions declarations to sas_internal.h
Move the declarations of functions used only within libsas from include/scsi/libsas.h to drivers/scsi/libsas/sas_internal.h Signed-off-by: Damien Le Moal <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: John Garry <[email protected]> Reviewed-by: Johannes Thumshirn <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 2c99e3d commit d10b11d

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

drivers/scsi/libsas/sas_internal.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@ struct sas_phy_data {
3939
struct sas_work enable_work;
4040
};
4141

42+
void sas_hash_addr(u8 *hashed, const u8 *sas_addr);
43+
44+
int sas_discover_root_expander(struct domain_device *dev);
45+
46+
int sas_ex_revalidate_domain(struct domain_device *dev);
47+
void sas_unregister_domain_devices(struct asd_sas_port *port, int gone);
48+
void sas_init_disc(struct sas_discovery *disc, struct asd_sas_port *port);
49+
void sas_discover_event(struct asd_sas_port *port, enum discover_event ev);
50+
51+
void sas_init_dev(struct domain_device *dev);
52+
void sas_unregister_dev(struct asd_sas_port *port, struct domain_device *dev);
53+
4254
void sas_scsi_recover_host(struct Scsi_Host *shost);
4355

4456
int sas_register_phys(struct sas_ha_struct *sas_ha);

include/scsi/libsas.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,6 @@ cmd_to_domain_dev(struct scsi_cmnd *cmd)
404404
return sdev_to_domain_dev(cmd->device);
405405
}
406406

407-
void sas_hash_addr(u8 *hashed, const u8 *sas_addr);
408-
409407
/* Before calling a notify event, LLDD should use this function
410408
* when the link is severed (possibly from its tasklet).
411409
* The idea is that the Class only reads those, while the LLDD,
@@ -699,20 +697,8 @@ extern struct scsi_transport_template *
699697
sas_domain_attach_transport(struct sas_domain_function_template *);
700698
extern struct device_attribute dev_attr_phy_event_threshold;
701699

702-
int sas_discover_root_expander(struct domain_device *);
703-
704-
int sas_ex_revalidate_domain(struct domain_device *);
705-
706-
void sas_unregister_domain_devices(struct asd_sas_port *port, int gone);
707-
void sas_init_disc(struct sas_discovery *disc, struct asd_sas_port *);
708-
void sas_discover_event(struct asd_sas_port *, enum discover_event ev);
709-
710700
int sas_discover_end_dev(struct domain_device *);
711701

712-
void sas_unregister_dev(struct asd_sas_port *port, struct domain_device *);
713-
714-
void sas_init_dev(struct domain_device *);
715-
716702
void sas_task_abort(struct sas_task *);
717703
int sas_eh_abort_handler(struct scsi_cmnd *cmd);
718704
int sas_eh_device_reset_handler(struct scsi_cmnd *cmd);

0 commit comments

Comments
 (0)