Applied "regmap: Move documentation to regmap.h" to the regmap tree
Subsystems (2)
Mark Brown
maintainerThe patch
regmap: Move documentation to regmap.h
has been applied to the regmap tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
1ed8111443ae8caa455e7107031da36d1a6d351aMon Sep 17 00:00:00 2001
From: Nicolas Boichat <[email protected]>
Date: Tue, 11 Aug 2015 18:04:21 +0800
Subject: [PATCH] regmap: Move documentation to regmap.h
Init functions defined in regmap*.c files are now prefixed with __, take lockdep key and class parameters, and should not be called directly: move the documentation to regmap.h, where the macros are defined.
--- drivers/base/regmap/regmap-ac97.c | 19 ----- drivers/base/regmap/regmap-i2c.c | 19 ----- drivers/base/regmap/regmap-mmio.c | 23 ----- drivers/base/regmap/regmap-spi.c | 19 ----- drivers/base/regmap/regmap-spmi.c | 34 -------- drivers/base/regmap/regmap.c | 25 ------ include/linux/regmap.h | 173 +++++++++++++++++++++++++++++++++++--- 7 files changed, 162 insertions(+), 150 deletions(-)
drivers/base/regmap/regmap-ac97.c +0 -19
@@ -78,15 +78,6 @@ static const struct regmap_bus ac97_regmap_bus = { .reg_read = regmap_ac97_reg_read, }; -/** -* regmap_init_ac97(): Initialise AC'97 register map -* -* @ac97: Device that will be interacted with -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer to -* a struct regmap. -*/ struct regmap *__regmap_init_ac97(struct snd_ac97 *ac97, const struct regmap_config *config, struct lock_class_key *lock_key,
@@ -97,16 +88,6 @@ struct regmap *__regmap_init_ac97(struct snd_ac97 *ac97, }EXPORT_SYMBOL_GPL (__regmap_init_ac97); -/** -* devm_regmap_init_ac97(): Initialise AC'97 register map -* -* @ac97: Device that will be interacted with -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer -* to a struct regmap. The regmap will be automatically freed by the -* device management code. -*/ struct regmap *__devm_regmap_init_ac97(struct snd_ac97 *ac97, const struct regmap_config *config, struct lock_class_key *lock_key,
drivers/base/regmap/regmap-i2c.c +0 -19
@@ -233,15 +233,6 @@ static const struct regmap_bus *regmap_get_i2c_bus(struct i2c_client *i2c,return ERR_PTR (-ENOTSUPP ); } -/** -* regmap_init_i2c(): Initialise register map -* -* @i2c: Device that will be interacted with -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer to -* a struct regmap. -*/ struct regmap *__regmap_init_i2c(struct i2c_client *i2c, const struct regmap_config *config, struct lock_class_key *lock_key,
@@ -257,16 +248,6 @@ struct regmap *__regmap_init_i2c(struct i2c_client *i2c, }EXPORT_SYMBOL_GPL (__regmap_init_i2c); -/** -* devm_regmap_init_i2c(): Initialise managed register map -* -* @i2c: Device that will be interacted with -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer -* to a struct regmap. The regmap will be automatically freed by the -* device management code. -*/ struct regmap *__devm_regmap_init_i2c(struct i2c_client *i2c, const struct regmap_config *config, struct lock_class_key *lock_key,
drivers/base/regmap/regmap-mmio.c +0 -23
@@ -296,17 +296,6 @@ err_free:return ERR_PTR (ret); } -/** -* regmap_init_mmio_clk(): Initialise register map with register clock -* -* @dev: Device that will be interacted with -* @clk_id: register clock consumer ID -* @regs: Pointer to memory-mapped IO region -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer to -* a struct regmap. -*/ struct regmap *__regmap_init_mmio_clk(struct device *dev, const char *clk_id, void __iomem *regs, const struct regmap_config *config,
@@ -324,18 +313,6 @@ struct regmap *__regmap_init_mmio_clk(struct device *dev, const char *clk_id, }EXPORT_SYMBOL_GPL (__regmap_init_mmio_clk); -/** -* devm_regmap_init_mmio_clk(): Initialise managed register map with clock -* -* @dev: Device that will be interacted with -* @clk_id: register clock consumer ID -* @regs: Pointer to memory-mapped IO region -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer -* to a struct regmap. The regmap will be automatically freed by the -* device management code. -*/ struct regmap *__devm_regmap_init_mmio_clk(struct device *dev, const char *clk_id, void __iomem *regs,
drivers/base/regmap/regmap-spi.c +0 -19
@@ -113,15 +113,6 @@ static struct regmap_bus regmap_spi = { .val_format_endian_default = REGMAP_ENDIAN_BIG, }; -/** -* regmap_init_spi(): Initialise register map -* -* @spi: Device that will be interacted with -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer to -* a struct regmap. -*/ struct regmap *__regmap_init_spi(struct spi_device *spi, const struct regmap_config *config, struct lock_class_key *lock_key,
@@ -132,16 +123,6 @@ struct regmap *__regmap_init_spi(struct spi_device *spi, }EXPORT_SYMBOL_GPL (__regmap_init_spi); -/** -* devm_regmap_init_spi(): Initialise register map -* -* @spi: Device that will be interacted with -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer -* to a struct regmap. The map will be automatically freed by the -* device management code. -*/ struct regmap *__devm_regmap_init_spi(struct spi_device *spi, const struct regmap_config *config, struct lock_class_key *lock_key,
drivers/base/regmap/regmap-spmi.c +0 -34
@@ -91,14 +91,6 @@ static struct regmap_bus regmap_spmi_base = { .val_format_endian_default = REGMAP_ENDIAN_NATIVE, }; -/** -* regmap_init_spmi_base(): Create regmap for the Base register space -* @sdev: SPMI device that will be interacted with -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer to -* a struct regmap. -*/ struct regmap *__regmap_init_spmi_base(struct spmi_device *sdev, const struct regmap_config *config, struct lock_class_key *lock_key,
@@ -109,15 +101,6 @@ struct regmap *__regmap_init_spmi_base(struct spmi_device *sdev, }EXPORT_SYMBOL_GPL (__regmap_init_spmi_base); -/** -* devm_regmap_init_spmi_base(): Create managed regmap for Base register space -* @sdev: SPMI device that will be interacted with -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer -* to a struct regmap. The regmap will be automatically freed by the -* device management code. -*/ struct regmap *__devm_regmap_init_spmi_base(struct spmi_device *sdev, const struct regmap_config *config, struct lock_class_key *lock_key,
@@ -228,14 +211,6 @@ static struct regmap_bus regmap_spmi_ext = { .val_format_endian_default = REGMAP_ENDIAN_NATIVE, }; -/** -* regmap_init_spmi_ext(): Create regmap for Ext register space -* @sdev: Device that will be interacted with -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer to -* a struct regmap. -*/ struct regmap *__regmap_init_spmi_ext(struct spmi_device *sdev, const struct regmap_config *config, struct lock_class_key *lock_key,
@@ -246,15 +221,6 @@ struct regmap *__regmap_init_spmi_ext(struct spmi_device *sdev, }EXPORT_SYMBOL_GPL (__regmap_init_spmi_ext); -/** -* devm_regmap_init_spmi_ext(): Create managed regmap for Ext register space -* @sdev: SPMI device that will be interacted with -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer -* to a struct regmap. The regmap will be automatically freed by the -* device management code. -*/ struct regmap *__devm_regmap_init_spmi_ext(struct spmi_device *sdev, const struct regmap_config *config, struct lock_class_key *lock_key,
drivers/base/regmap/regmap.c +0 -25
@@ -515,18 +515,6 @@ enum regmap_endian regmap_get_val_endian(struct device *dev, }EXPORT_SYMBOL_GPL (regmap_get_val_endian); -/** -* regmap_init(): Initialise register map -* -* @dev: Device that will be interacted with -* @bus: Bus-specific callbacks to use with device -* @bus_context: Data passed to bus-specific callbacks -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer to -* a struct regmap. This function should generally not be called -* directly, it should be called by bus-specific init functions. -*/ struct regmap *__regmap_init(struct device *dev, const struct regmap_bus *bus, void *bus_context,
@@ -912,19 +900,6 @@ static void devm_regmap_release(struct device *dev, void *res)regmap_exit (*(struct regmap **)res); } -/** -* devm_regmap_init(): Initialise managed register map -* -* @dev: Device that will be interacted with -* @bus: Bus-specific callbacks to use with device -* @bus_context: Data passed to bus-specific callbacks -* @config: Configuration for register map -* -* The return value will be an ERR_PTR() on error or a valid pointer -* to a struct regmap. This function should generally not be called -* directly, it should be called by bus-specific init functions. The -* map will be automatically freed by the device management code. -*/ struct regmap *__devm_regmap_init(struct device *dev, const struct regmap_bus *bus, void *bus_context,
include/linux/regmap.h +162 -11
233 lines not on this page · raw message
Signature · 1 line
2.5.0