Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'regmap-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap updates from Mark Brown:
"This just contains a few small fixes, there's been no substantial
development on regmap this release cycle"
* tag 'regmap-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: use int type to store negative error codes
regmap: Remove superfluous check for !config in __regmap_init()
regmap: mmio: Add missing MODULE_DESCRIPTION()
+9
-5
+1
drivers/base/regmap/regmap-mmio.c
+1
drivers/base/regmap/regmap-mmio.c
+8
-5
drivers/base/regmap/regmap.c
+8
-5
drivers/base/regmap/regmap.c
···
827
827
map->read_flag_mask = bus->read_flag_mask;
828
828
}
829
829
830
-
if (config && config->read && config->write) {
830
+
if (config->read && config->write) {
831
831
map->reg_read = _regmap_bus_read;
832
832
if (config->reg_update_bits)
833
833
map->reg_update_bits = config->reg_update_bits;
···
2258
2258
* @field: Register field to operate on
2259
2259
* @bits: Bits to test
2260
2260
*
2261
-
* Returns -1 if the underlying regmap_field_read() fails, 0 if at least one of the
2262
-
* tested bits is not set and 1 if all tested bits are set.
2261
+
* Returns negative errno if the underlying regmap_field_read() fails,
2262
+
* 0 if at least one of the tested bits is not set and 1 if all tested
2263
+
* bits are set.
2263
2264
*/
2264
2265
int regmap_field_test_bits(struct regmap_field *field, unsigned int bits)
2265
2266
{
2266
-
unsigned int val, ret;
2267
+
unsigned int val;
2268
+
int ret;
2267
2269
2268
2270
ret = regmap_field_read(field, &val);
2269
2271
if (ret)
···
3311
3309
*/
3312
3310
int regmap_test_bits(struct regmap *map, unsigned int reg, unsigned int bits)
3313
3311
{
3314
-
unsigned int val, ret;
3312
+
unsigned int val;
3313
+
int ret;
3315
3314
3316
3315
ret = regmap_read(map, reg, &val);
3317
3316
if (ret)