Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: libsas: Remove temporarily-added _gfp() API variants

These variants were added for bisectability. Remove them, as all call sites
have now been convertd to use the original API.

Link: https://lore.kernel.org/r/20210118100955.1761652-20-a.darwish@linutronix.de
Cc: Jason Yan <yanaijie@huawei.com>
Reviewed-by: John Garry <john.garry@huawei.com>
Signed-off-by: Ahmed S. Darwish <a.darwish@linutronix.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Ahmed S. Darwish and committed by
Martin K. Petersen
65f7cfba 36cdfd0f

-31
-2
Documentation/scsi/libsas.rst
··· 191 191 /* LLDD calls these to notify the class of an event. */ 192 192 void sas_notify_port_event(struct sas_phy *, enum port_event, gfp_t); 193 193 void sas_notify_phy_event(struct sas_phy *, enum phy_event, gfp_t); 194 - void sas_notify_port_event_gfp(struct sas_phy *, enum port_event, gfp_t); 195 - void sas_notify_phy_event_gfp(struct sas_phy *, enum phy_event, gfp_t); 196 194 197 195 The port notification:: 198 196
-14
drivers/scsi/libsas/sas_event.c
··· 155 155 } 156 156 EXPORT_SYMBOL_GPL(sas_notify_port_event); 157 157 158 - int sas_notify_port_event_gfp(struct asd_sas_phy *phy, enum port_event event, 159 - gfp_t gfp_flags) 160 - { 161 - return sas_notify_port_event(phy, event, gfp_flags); 162 - } 163 - EXPORT_SYMBOL_GPL(sas_notify_port_event_gfp); 164 - 165 158 int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event, 166 159 gfp_t gfp_flags) 167 160 { ··· 177 184 return ret; 178 185 } 179 186 EXPORT_SYMBOL_GPL(sas_notify_phy_event); 180 - 181 - int sas_notify_phy_event_gfp(struct asd_sas_phy *phy, enum phy_event event, 182 - gfp_t gfp_flags) 183 - { 184 - return sas_notify_phy_event(phy, event, gfp_flags); 185 - } 186 - EXPORT_SYMBOL_GPL(sas_notify_phy_event_gfp);
-7
drivers/scsi/libsas/sas_init.c
··· 619 619 return event; 620 620 } 621 621 622 - struct asd_sas_event *sas_alloc_event_gfp(struct asd_sas_phy *phy, 623 - gfp_t gfp_flags) 624 - { 625 - 626 - return sas_alloc_event(phy, gfp_flags); 627 - } 628 - 629 622 void sas_free_event(struct asd_sas_event *event) 630 623 { 631 624 struct asd_sas_phy *phy = event->phy;
-4
drivers/scsi/libsas/sas_internal.h
··· 49 49 void sas_unregister_phys(struct sas_ha_struct *sas_ha); 50 50 51 51 struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy, gfp_t gfp_flags); 52 - struct asd_sas_event *sas_alloc_event_gfp(struct asd_sas_phy *phy, 53 - gfp_t gfp_flags); 54 52 void sas_free_event(struct asd_sas_event *event); 55 53 56 54 int sas_register_ports(struct sas_ha_struct *sas_ha); ··· 78 80 79 81 int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event, 80 82 gfp_t flags); 81 - int sas_notify_phy_event_gfp(struct asd_sas_phy *phy, enum phy_event event, 82 - gfp_t flags); 83 83 void sas_device_set_phy(struct domain_device *dev, struct sas_port *port); 84 84 struct domain_device *sas_find_dev_by_rphy(struct sas_rphy *rphy); 85 85 struct domain_device *sas_ex_to_ata(struct domain_device *ex_dev, int phy_id);
-4
include/scsi/libsas.h
··· 706 706 gfp_t gfp_flags); 707 707 int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event, 708 708 gfp_t gfp_flags); 709 - int sas_notify_port_event_gfp(struct asd_sas_phy *phy, enum port_event event, 710 - gfp_t gfp_flags); 711 - int sas_notify_phy_event_gfp(struct asd_sas_phy *phy, enum phy_event event, 712 - gfp_t gfp_flags); 713 709 714 710 #endif /* _SASLIB_H_ */