Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regulator-next

Mark Brown committed 12 years ago

Commit f955c8b2 parents ed4bf4f e8b15c02 files · +20 −0Browse files

Unified · Split

2 files

@@ -1073,6 +1073,19 @@ struct regmap dev_get_regmap(struct device dev, const char *name) · 1072 unmodified lines
1073	}	1073	}
1074	EXPORT_SYMBOL_GPL(dev_get_regmap);	1074	EXPORT_SYMBOL_GPL(dev_get_regmap);
1075		1075
		1076	/**
		1077	* regmap_get_device(): Obtain the device from a regmap
		1078	*
		1079	* @map: Register map to operate on.
		1080	*
		1081	* Returns the underlying device that the regmap has been created for.
		1082	*/
		1083	struct device regmap_get_device(struct regmap map)
		1084	{
		1085	return map->dev;
		1086	}
		1087	EXPORT_SYMBOL_GPL(regmap_get_device);
		1088
1076	static int _regmap_select_page(struct regmap map, unsigned int reg,	1089	static int _regmap_select_page(struct regmap map, unsigned int reg,
1077	struct regmap_range_node *range,	1090	struct regmap_range_node *range,
1078	unsigned int val_num)	1091	unsigned int val_num)

 int regmap_reinit_cache(struct regmap *map,
 			const struct regmap_config *config);
 struct regmap *dev_get_regmap(struct device *dev, const char *name);
+struct device *regmap_get_device(struct regmap *map);
 int regmap_write(struct regmap *map, unsigned int reg, unsigned int val);
 int regmap_write_async(struct regmap *map, unsigned int reg, unsigned int val);
 int regmap_raw_write(struct regmap *map, unsigned int reg,
 	return NULL;
 }
+static inline struct device *regmap_get_device(struct regmap *map)
+{
+	WARN_ONCE(1, "regmap API is disabled");
+	return NULL;
+}
 #endif
 #endif

Keyboard shortcuts