fix up queue-5.14/firmware-arm_ffa-add-missing-remove-callback-to-ffa_bus_type.patch

diff --git a/queue-5.14/firmware-arm_ffa-add-missing-remove-callback-to-ffa_bus_type.patch b/queue-5.14/firmware-arm_ffa-add-missing-remove-callback-to-ffa_bus_type.patch
index 33fb7708012fb6a81214ebd82ee9386fb6f86c7b..c0751c0c3446883fb11b0d0c373b65f2ee3e30fd 100644 (file)
--- a/queue-5.14/firmware-arm_ffa-add-missing-remove-callback-to-ffa_bus_type.patch
+++ b/queue-5.14/firmware-arm_ffa-add-missing-remove-callback-to-ffa_bus_type.patch
@@ -24,26 +24,28 @@ Tested-by: Jens Wiklander <jens.wiklander@linaro.org>
 Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/firmware/arm_ffa/bus.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
+ drivers/firmware/arm_ffa/bus.c |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
 --- a/drivers/firmware/arm_ffa/bus.c
 +++ b/drivers/firmware/arm_ffa/bus.c
-@@ -49,6 +49,13 @@ static int ffa_device_probe(struct devic
+@@ -49,6 +49,15 @@ static int ffa_device_probe(struct devic
        return ffa_drv->probe(ffa_dev);
  }
  
-+static void ffa_device_remove(struct device *dev)
++static int ffa_device_remove(struct device *dev)
 +{
 +      struct ffa_driver *ffa_drv = to_ffa_driver(dev->driver);
 +
 +      ffa_drv->remove(to_ffa_dev(dev));
++
++      return 0;
 +}
 +
  static int ffa_device_uevent(struct device *dev, struct kobj_uevent_env *env)
  {
        struct ffa_device *ffa_dev = to_ffa_dev(dev);
-@@ -86,6 +93,7 @@ struct bus_type ffa_bus_type = {
+@@ -86,6 +95,7 @@ struct bus_type ffa_bus_type = {
        .name           = "arm_ffa",
        .match          = ffa_device_match,
        .probe          = ffa_device_probe,