Commit f6ec3397 authored by Damien Le Moal's avatar Damien Le Moal Committed by Bjorn Helgaas
Browse files

PCI: endpoint: Move pci_epf_type_add_cfs() code 

pci_epf_type_add_cfs() is called only from pci_ep_cfs_add_type_group() in
drivers/pci/endpoint/pci-ep-cfs.c, so there is no need to export this
function.  Move its code from pci-epf-core.c to pci-ep-cfs.c as a static
function.

Link: https://lore.kernel.org/r/20230415023542.77601-3-dlemoal@kernel.org


Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lpieralisi@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarManivannan Sadhasivam <mani@kernel.org>
parent 70b3740f

drivers/pci/endpoint/pci-ep-cfs.c

+36 −0
Original line number Diff line number Diff line
@@ -509,6 +509,42 @@ static const struct config_item_type pci_epf_type = { 
	.ct_owner	= THIS_MODULE,

};



/**

 * pci_epf_type_add_cfs() - Help function drivers to expose function specific

 *                          attributes in configfs

 * @epf: the EPF device that has to be configured using configfs

 * @group: the parent configfs group (corresponding to entries in

 *         pci_epf_device_id)

 *

 * Invoke to expose function specific attributes in configfs.

 *

 * Return: A pointer to a config_group structure or NULL if the function driver

 * does not have anything to expose (attributes configured by user) or if

 * the function driver does not implement the add_cfs() method.

 *

 * Returns an error pointer if this function is called for an unbound EPF device

 * or if the EPF driver add_cfs() method fails.

 */

static struct config_group *pci_epf_type_add_cfs(struct pci_epf *epf,

						 struct config_group *group)

{

	struct config_group *epf_type_group;



	if (!epf->driver) {

		dev_err(&epf->dev, "epf device not bound to driver\n");

		return NULL;

	}



	if (!epf->driver->ops->add_cfs)

		return NULL;



	mutex_lock(&epf->lock);

	epf_type_group = epf->driver->ops->add_cfs(epf, group);

	mutex_unlock(&epf->lock);



	return epf_type_group;

}



static void pci_ep_cfs_add_type_group(struct pci_epf_group *epf_group)

{

	struct config_group *group;

drivers/pci/endpoint/pci-epf-core.c

+0 −32
Original line number Diff line number Diff line
@@ -20,38 +20,6 @@ static DEFINE_MUTEX(pci_epf_mutex); 
static struct bus_type pci_epf_bus_type;

static const struct device_type pci_epf_type;



/**

 * pci_epf_type_add_cfs() - Help function drivers to expose function specific

 *                          attributes in configfs

 * @epf: the EPF device that has to be configured using configfs

 * @group: the parent configfs group (corresponding to entries in

 *         pci_epf_device_id)

 *

 * Invoke to expose function specific attributes in configfs. If the function

 * driver does not have anything to expose (attributes configured by user),

 * return NULL.

 */

struct config_group *pci_epf_type_add_cfs(struct pci_epf *epf,

					  struct config_group *group)

{

	struct config_group *epf_type_group;



	if (!epf->driver) {

		dev_err(&epf->dev, "epf device not bound to driver\n");

		return NULL;

	}



	if (!epf->driver->ops->add_cfs)

		return NULL;



	mutex_lock(&epf->lock);

	epf_type_group = epf->driver->ops->add_cfs(epf, group);

	mutex_unlock(&epf->lock);



	return epf_type_group;

}

EXPORT_SYMBOL_GPL(pci_epf_type_add_cfs);



/**

 * pci_epf_unbind() - Notify the function driver that the binding between the

 *		      EPF device and EPC device has been lost

include/linux/pci-epf.h

+0 −2
Original line number Diff line number Diff line
@@ -214,8 +214,6 @@ void pci_epf_free_space(struct pci_epf *epf, void *addr, enum pci_barno bar, 
			enum pci_epc_interface_type type);

int pci_epf_bind(struct pci_epf *epf);

void pci_epf_unbind(struct pci_epf *epf);

struct config_group *pci_epf_type_add_cfs(struct pci_epf *epf,

					  struct config_group *group);

int pci_epf_add_vepf(struct pci_epf *epf_pf, struct pci_epf *epf_vf);

void pci_epf_remove_vepf(struct pci_epf *epf_pf, struct pci_epf *epf_vf);

#endif /* __LINUX_PCI_EPF_H */