Skip to content

Commit

Permalink
PCI: endpoint: Make struct pci_epf_driver::remove return void
Browse files Browse the repository at this point in the history
The driver core ignores the return value of pci_epf_device_remove()
(because there is only little it can do when a device disappears) and
there are no pci_epf_drivers with a remove callback.

So make it impossible for future drivers to return an unused error code
by changing the remove prototype to return void.

The real motivation for this change is the quest to make struct
bus_type::remove return void, too.

Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20210713193522.1770306-2-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Uwe Kleine-König authored and Greg Kroah-Hartman committed Jul 21, 2021
1 parent 2734d6c commit dde0a31
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions drivers/pci/endpoint/pci-epf-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -389,15 +389,14 @@ static int pci_epf_device_probe(struct device *dev)

static int pci_epf_device_remove(struct device *dev)
{
int ret = 0;
struct pci_epf *epf = to_pci_epf(dev);
struct pci_epf_driver *driver = to_pci_epf_driver(dev->driver);

if (driver->remove)
ret = driver->remove(epf);
driver->remove(epf);
epf->driver = NULL;

return ret;
return 0;
}

static struct bus_type pci_epf_bus_type = {
Expand Down
2 changes: 1 addition & 1 deletion include/linux/pci-epf.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ struct pci_epf_ops {
*/
struct pci_epf_driver {
int (*probe)(struct pci_epf *epf);
int (*remove)(struct pci_epf *epf);
void (*remove)(struct pci_epf *epf);

struct device_driver driver;
struct pci_epf_ops *ops;
Expand Down

0 comments on commit dde0a31

Please sign in to comment.