Merge remote-tracking branch 'regulator/topic/core' into regulator-next (fcaa3167) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/regulator/core.c

+18 −28

Original line number	Diff line number	Diff line
		@@ -1462,7 +1462,7 @@ static struct regulator_dev regulator_lookup_by_name(const char name)
		static struct regulator_dev regulator_dev_lookup(struct device dev,
		const char *supply)
		{
		struct regulator_dev *r;
		struct regulator_dev *r = NULL;
		struct device_node *node;
		struct regulator_map *map;
		const char *devname = NULL;
		@@ -1489,10 +1489,6 @@ static struct regulator_dev regulator_dev_lookup(struct device dev,
		if (dev)
		devname = dev_name(dev);

		r = regulator_lookup_by_name(supply);
		if (r)
		return r;

		mutex_lock(&regulator_list_mutex);
		list_for_each_entry(map, &regulator_map_list, list) {
		/* If the mapping has a device set up it must match */
		@@ -1508,6 +1504,10 @@ static struct regulator_dev regulator_dev_lookup(struct device dev,
		}
		mutex_unlock(&regulator_list_mutex);

		if (r)
		return r;

		r = regulator_lookup_by_name(supply);
		if (r)
		return r;

		@@ -4312,41 +4312,31 @@ void regulator_get_init_drvdata(struct regulator_init_data reg_init_data)
		EXPORT_SYMBOL_GPL(regulator_get_init_drvdata);

		#ifdef CONFIG_DEBUG_FS
		static ssize_t supply_map_read_file(struct file file, char __user user_buf,
		size_t count, loff_t *ppos)
		static int supply_map_show(struct seq_file sf, void data)
		{
		char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
		ssize_t len, ret = 0;
		struct regulator_map *map;

		if (!buf)
		return -ENOMEM;

		list_for_each_entry(map, &regulator_map_list, list) {
		len = snprintf(buf + ret, PAGE_SIZE - ret,
		"%s -> %s.%s\n",
		seq_printf(sf, "%s -> %s.%s\n",
		rdev_get_name(map->regulator), map->dev_name,
		map->supply);
		if (len >= 0)
		ret += len;
		if (ret > PAGE_SIZE) {
		ret = PAGE_SIZE;
		break;
		}
		}

		ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);

		kfree(buf);
		return 0;
		}

		return ret;
		static int supply_map_open(struct inode inode, struct file file)
		{
		return single_open(file, supply_map_show, inode->i_private);
		}
		#endif

		static const struct file_operations supply_map_fops = {
		#ifdef CONFIG_DEBUG_FS
		.read = supply_map_read_file,
		.llseek = default_llseek,
		.open = supply_map_open,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = single_release,
		#endif
		};