Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71db87ba authored by Viresh Kumar's avatar Viresh Kumar Committed by Greg Kroah-Hartman
Browse files

bus: subsys: update return type of ->remove_dev() to void 



Its return value is not used by the subsys core and nothing meaningful
can be done with it, even if we want to use it. The subsys device is
anyway getting removed.

Update prototype of ->remove_dev() to make its return type as void. Fix
all usage sites as well.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 52cdbdd4

arch/sh/kernel/cpu/sh4/sq.c

+1 −2
Original line number Diff line number Diff line
@@ -355,13 +355,12 @@ static int sq_dev_add(struct device *dev, struct subsys_interface *sif) 
	return error;

}



static int sq_dev_remove(struct device *dev, struct subsys_interface *sif)

static void sq_dev_remove(struct device *dev, struct subsys_interface *sif)

{

	unsigned int cpu = dev->id;

	struct kobject *kobj = sq_kobject[cpu];



	kobject_put(kobj);

	return 0;

}



static struct subsys_interface sq_interface = {

arch/tile/kernel/sysfs.c

+4 −7
Original line number Diff line number Diff line
@@ -198,16 +198,13 @@ static int hv_stats_device_add(struct device *dev, struct subsys_interface *sif) 
	return err;

}



static int hv_stats_device_remove(struct device *dev,

static void hv_stats_device_remove(struct device *dev,

				   struct subsys_interface *sif)

{

	int cpu = dev->id;



	if (!cpu_online(cpu))

		return 0;



	if (cpu_online(cpu))

		sysfs_remove_file(&dev->kobj, &dev_attr_hv_stats.attr);

	return 0;

}

arch/x86/kernel/cpu/microcode/core.c

+2 −3
Original line number Diff line number Diff line
@@ -377,17 +377,16 @@ static int mc_device_add(struct device *dev, struct subsys_interface *sif) 
	return err;

}



static int mc_device_remove(struct device *dev, struct subsys_interface *sif)

static void mc_device_remove(struct device *dev, struct subsys_interface *sif)

{

	int cpu = dev->id;



	if (!cpu_online(cpu))

		return 0;

		return;



	pr_debug("CPU%d removed\n", cpu);

	microcode_fini_cpu(cpu);

	sysfs_remove_group(&dev->kobj, &mc_attr_group);

	return 0;

}



static struct subsys_interface mc_cpu_interface = {

drivers/cpufreq/cpufreq.c

+5 −7
Original line number Diff line number Diff line
@@ -1518,7 +1518,7 @@ static int __cpufreq_remove_dev_finish(struct device *dev, 
 *

 * Removes the cpufreq interface for a CPU device.

 */

static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)

static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)

{

	unsigned int cpu = dev->id;

	int ret;
@@ -1533,7 +1533,7 @@ static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif) 
		struct cpumask mask;



		if (!policy)

			return 0;

			return;



		cpumask_copy(&mask, policy->related_cpus);

		cpumask_clear_cpu(cpu, &mask);
@@ -1544,19 +1544,17 @@ static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif) 
		 */

		if (cpumask_intersects(&mask, cpu_present_mask)) {

			remove_cpu_dev_symlink(policy, cpu);

			return 0;

			return;

		}



		cpufreq_policy_free(policy, true);

		return 0;

		return;

	}



	ret = __cpufreq_remove_dev_prepare(dev, sif);



	if (!ret)

		ret = __cpufreq_remove_dev_finish(dev, sif);



	return ret;

		__cpufreq_remove_dev_finish(dev, sif);

}



static void handle_update(struct work_struct *work)

drivers/net/rionet.c

+1 −3
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int rionet_close(struct net_device *ndev) 
	return 0;

}



static int rionet_remove_dev(struct device *dev, struct subsys_interface *sif)

static void rionet_remove_dev(struct device *dev, struct subsys_interface *sif)

{

	struct rio_dev *rdev = to_rio_dev(dev);

	unsigned char netid = rdev->net->hport->id;
@@ -416,8 +416,6 @@ static int rionet_remove_dev(struct device *dev, struct subsys_interface *sif) 
			}

		}

	}



	return 0;

}



static void rionet_get_drvinfo(struct net_device *ndev,