From: Vinod Koul <vkoul@kernel.org>
Date: Tue, 27 Jul 2021 13:42:14 +0000 (+0530)
Subject: Merge tag 'bus_remove_return_void-5.15' into next
X-Git-Tag: accepted/tizen/unified/20230118.172025~6417^2~56
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c28d5d5688c6278a1ad32670cbee35802a9e65c1;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'bus_remove_return_void-5.15' into next

This helps to remove conflict on idxd driver

 Conflicts:
	drivers/dma/idxd/sysfs.c
	drivers/dma/idxd/bus.c

Greg says:

Bus: Make remove callback return void tag

Tag for other trees/branches to pull from in order to have a stable
place to build off of if they want to add new busses for 5.15.

Signed-off-by: Vinod Koul <vkoul@kernel.org>
---

c28d5d5688c6278a1ad32670cbee35802a9e65c1
diff --cc drivers/dma/idxd/bus.c
index 02837f0,0000000..6f84621
mode 100644,000000..100644
--- a/drivers/dma/idxd/bus.c
+++ b/drivers/dma/idxd/bus.c
@@@ -1,92 -1,0 +1,91 @@@
 +// SPDX-License-Identifier: GPL-2.0
 +/* Copyright(c) 2021 Intel Corporation. All rights rsvd. */
 +#include <linux/init.h>
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/device.h>
 +#include "idxd.h"
 +
 +
 +int __idxd_driver_register(struct idxd_device_driver *idxd_drv, struct module *owner,
 +			   const char *mod_name)
 +{
 +	struct device_driver *drv = &idxd_drv->drv;
 +
 +	if (!idxd_drv->type) {
 +		pr_debug("driver type not set (%ps)\n", __builtin_return_address(0));
 +		return -EINVAL;
 +	}
 +
 +	drv->name = idxd_drv->name;
 +	drv->bus = &dsa_bus_type;
 +	drv->owner = owner;
 +	drv->mod_name = mod_name;
 +
 +	return driver_register(drv);
 +}
 +EXPORT_SYMBOL_GPL(__idxd_driver_register);
 +
 +void idxd_driver_unregister(struct idxd_device_driver *idxd_drv)
 +{
 +	driver_unregister(&idxd_drv->drv);
 +}
 +EXPORT_SYMBOL_GPL(idxd_driver_unregister);
 +
 +static int idxd_config_bus_match(struct device *dev,
 +				 struct device_driver *drv)
 +{
 +	struct idxd_device_driver *idxd_drv =
 +		container_of(drv, struct idxd_device_driver, drv);
 +	struct idxd_dev *idxd_dev = confdev_to_idxd_dev(dev);
 +	int i = 0;
 +
 +	while (idxd_drv->type[i] != IDXD_DEV_NONE) {
 +		if (idxd_dev->type == idxd_drv->type[i])
 +			return 1;
 +		i++;
 +	}
 +
 +	return 0;
 +}
 +
 +static int idxd_config_bus_probe(struct device *dev)
 +{
 +	struct idxd_device_driver *idxd_drv =
 +		container_of(dev->driver, struct idxd_device_driver, drv);
 +	struct idxd_dev *idxd_dev = confdev_to_idxd_dev(dev);
 +
 +	return idxd_drv->probe(idxd_dev);
 +}
 +
- static int idxd_config_bus_remove(struct device *dev)
++static void idxd_config_bus_remove(struct device *dev)
 +{
 +	struct idxd_device_driver *idxd_drv =
 +		container_of(dev->driver, struct idxd_device_driver, drv);
 +	struct idxd_dev *idxd_dev = confdev_to_idxd_dev(dev);
 +
 +	idxd_drv->remove(idxd_dev);
- 	return 0;
 +}
 +
 +struct bus_type dsa_bus_type = {
 +	.name = "dsa",
 +	.match = idxd_config_bus_match,
 +	.probe = idxd_config_bus_probe,
 +	.remove = idxd_config_bus_remove,
 +};
 +EXPORT_SYMBOL_GPL(dsa_bus_type);
 +
 +static int __init dsa_bus_init(void)
 +{
 +	return bus_register(&dsa_bus_type);
 +}
 +module_init(dsa_bus_init);
 +
 +static void __exit dsa_bus_exit(void)
 +{
 +	bus_unregister(&dsa_bus_type);
 +}
 +module_exit(dsa_bus_exit);
 +
 +MODULE_DESCRIPTION("IDXD driver dsa_bus_type driver");
 +MODULE_LICENSE("GPL v2");