Commit 65f7cfba authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Martin K. Petersen
Browse files

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: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarAhmed S. Darwish <a.darwish@linutronix.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 36cdfd0f

Documentation/scsi/libsas.rst

+0 −2
Original line number Diff line number Diff line
@@ -191,8 +191,6 @@ The event interface:: 
	/* LLDD calls these to notify the class of an event. */

	void sas_notify_port_event(struct sas_phy *, enum port_event, gfp_t);

	void sas_notify_phy_event(struct sas_phy *, enum phy_event, gfp_t);

	void sas_notify_port_event_gfp(struct sas_phy *, enum port_event, gfp_t);

	void sas_notify_phy_event_gfp(struct sas_phy *, enum phy_event, gfp_t);



The port notification::

drivers/scsi/libsas/sas_event.c

+0 −14
Original line number Diff line number Diff line
@@ -155,13 +155,6 @@ int sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event, 
}

EXPORT_SYMBOL_GPL(sas_notify_port_event);



int sas_notify_port_event_gfp(struct asd_sas_phy *phy, enum port_event event,

			      gfp_t gfp_flags)

{

	return sas_notify_port_event(phy, event, gfp_flags);

}

EXPORT_SYMBOL_GPL(sas_notify_port_event_gfp);



int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event,

			 gfp_t gfp_flags)

{
@@ -184,10 +177,3 @@ int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event, 
	return ret;

}

EXPORT_SYMBOL_GPL(sas_notify_phy_event);
 


int sas_notify_phy_event_gfp(struct asd_sas_phy *phy, enum phy_event event,

			     gfp_t gfp_flags)

{

	return sas_notify_phy_event(phy, event, gfp_flags);

}

EXPORT_SYMBOL_GPL(sas_notify_phy_event_gfp);

drivers/scsi/libsas/sas_init.c

+0 −7
Original line number Diff line number Diff line
@@ -619,13 +619,6 @@ struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy, 
	return event;

}



struct asd_sas_event *sas_alloc_event_gfp(struct asd_sas_phy *phy,

					  gfp_t gfp_flags)

{



	return sas_alloc_event(phy, gfp_flags);

}



void sas_free_event(struct asd_sas_event *event)

{

	struct asd_sas_phy *phy = event->phy;

drivers/scsi/libsas/sas_internal.h

+0 −4
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ int sas_register_phys(struct sas_ha_struct *sas_ha); 
void sas_unregister_phys(struct sas_ha_struct *sas_ha);



struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy, gfp_t gfp_flags);

struct asd_sas_event *sas_alloc_event_gfp(struct asd_sas_phy *phy,

					  gfp_t gfp_flags);

void sas_free_event(struct asd_sas_event *event);



int  sas_register_ports(struct sas_ha_struct *sas_ha);
@@ -80,8 +78,6 @@ int sas_smp_get_phy_events(struct sas_phy *phy); 


int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event,

			 gfp_t flags);

int sas_notify_phy_event_gfp(struct asd_sas_phy *phy, enum phy_event event,

			     gfp_t flags);

void sas_device_set_phy(struct domain_device *dev, struct sas_port *port);

struct domain_device *sas_find_dev_by_rphy(struct sas_rphy *rphy);

struct domain_device *sas_ex_to_ata(struct domain_device *ex_dev, int phy_id);

include/scsi/libsas.h

+0 −4
Original line number Diff line number Diff line
@@ -706,9 +706,5 @@ int sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event, 
			  gfp_t gfp_flags);

int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event,

			 gfp_t gfp_flags);

int sas_notify_port_event_gfp(struct asd_sas_phy *phy, enum port_event event,

			      gfp_t gfp_flags);

int sas_notify_phy_event_gfp(struct asd_sas_phy *phy, enum phy_event event,

			     gfp_t gfp_flags);



#endif /* _SASLIB_H_ */