mfd: max77693: Remove unnecessary wrapper functions

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

This patch removes wrapper functions used to access regmap, and
make driver using regmap_*() functions instead.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Mark Brown <broonie@linaro.org>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Robert Baldyga and committed by

Lee Jones 11 years ago d0540f91 7171511e

+54 -104

5 changed files

expand all

drivers

extcon

extcon-max77693.c

mfd

max77693-irq.c

max77693.c

regulator

max77693.c

include

linux

mfd

max77693-private.h

+16 -16

drivers/extcon/extcon-max77693.c

··· 255 255 case ADC_DEBOUNCE_TIME_10MS: 256 256 case ADC_DEBOUNCE_TIME_25MS: 257 257 case ADC_DEBOUNCE_TIME_38_62MS: 258 - ret = max77693_update_reg(info->max77693->regmap_muic, 258 + ret = regmap_update_bits(info->max77693->regmap_muic, 259 259 MAX77693_MUIC_REG_CTRL3, 260 - time << CONTROL3_ADCDBSET_SHIFT, 261 - CONTROL3_ADCDBSET_MASK); 260 + CONTROL3_ADCDBSET_MASK, 261 + time << CONTROL3_ADCDBSET_SHIFT); 262 262 if (ret) { 263 263 dev_err(info->dev, "failed to set ADC debounce time\n"); 264 264 return ret; ··· 286 286 u8 val, bool attached) 287 287 { 288 288 int ret = 0; 289 - u8 ctrl1, ctrl2 = 0; 289 + unsigned int ctrl1, ctrl2 = 0; 290 290 291 291 if (attached) 292 292 ctrl1 = val; 293 293 else 294 294 ctrl1 = CONTROL1_SW_OPEN; 295 295 296 - ret = max77693_update_reg(info->max77693->regmap_muic, 297 - MAX77693_MUIC_REG_CTRL1, ctrl1, COMP_SW_MASK); 296 + ret = regmap_update_bits(info->max77693->regmap_muic, 297 + MAX77693_MUIC_REG_CTRL1, COMP_SW_MASK, ctrl1); 298 298 if (ret < 0) { 299 299 dev_err(info->dev, "failed to update MUIC register\n"); 300 300 return ret; ··· 305 305 else 306 306 ctrl2 |= CONTROL2_LOWPWR_MASK; /* LowPwr=1, CPEn=0 */ 307 307 308 - ret = max77693_update_reg(info->max77693->regmap_muic, 309 - MAX77693_MUIC_REG_CTRL2, ctrl2, 310 - CONTROL2_LOWPWR_MASK | CONTROL2_CPEN_MASK); 308 + ret = regmap_update_bits(info->max77693->regmap_muic, 309 + MAX77693_MUIC_REG_CTRL2, 310 + CONTROL2_LOWPWR_MASK | CONTROL2_CPEN_MASK, ctrl2); 311 311 if (ret < 0) { 312 312 dev_err(info->dev, "failed to update MUIC register\n"); 313 313 return ret; ··· 969 969 if (info->irq == muic_irqs[i].virq) 970 970 irq_type = muic_irqs[i].irq; 971 971 972 - ret = max77693_bulk_read(info->max77693->regmap_muic, 973 - MAX77693_MUIC_REG_STATUS1, 2, info->status); 972 + ret = regmap_bulk_read(info->max77693->regmap_muic, 973 + MAX77693_MUIC_REG_STATUS1, info->status, 2); 974 974 if (ret) { 975 975 dev_err(info->dev, "failed to read MUIC register\n"); 976 976 mutex_unlock(&info->mutex); ··· 1042 1042 mutex_lock(&info->mutex); 1043 1043 1044 1044 /* Read STATUSx register to detect accessory */ 1045 - ret = max77693_bulk_read(info->max77693->regmap_muic, 1046 - MAX77693_MUIC_REG_STATUS1, 2, info->status); 1045 + ret = regmap_bulk_read(info->max77693->regmap_muic, 1046 + MAX77693_MUIC_REG_STATUS1, info->status, 2); 1047 1047 if (ret) { 1048 1048 dev_err(info->dev, "failed to read MUIC register\n"); 1049 1049 mutex_unlock(&info->mutex); ··· 1095 1095 int delay_jiffies; 1096 1096 int ret; 1097 1097 int i; 1098 - u8 id; 1098 + unsigned int id; 1099 1099 1100 1100 info = devm_kzalloc(&pdev->dev, sizeof(struct max77693_muic_info), 1101 1101 GFP_KERNEL); ··· 1204 1204 enum max77693_irq_source irq_src 1205 1205 = MAX77693_IRQ_GROUP_NR; 1206 1206 1207 - max77693_write_reg(info->max77693->regmap_muic, 1207 + regmap_write(info->max77693->regmap_muic, 1208 1208 init_data[i].addr, 1209 1209 init_data[i].data); 1210 1210 ··· 1262 1262 max77693_muic_set_path(info, info->path_uart, true); 1263 1263 1264 1264 /* Check revision number of MUIC device*/ 1265 - ret = max77693_read_reg(info->max77693->regmap_muic, 1265 + ret = regmap_read(info->max77693->regmap_muic, 1266 1266 MAX77693_MUIC_REG_ID, &id); 1267 1267 if (ret < 0) { 1268 1268 dev_err(&pdev->dev, "failed to read revision number\n");

+30 -20

drivers/mfd/max77693-irq.c

··· 30 30 #include <linux/irqdomain.h> 31 31 #include <linux/mfd/max77693.h> 32 32 #include <linux/mfd/max77693-private.h> 33 + #include <linux/regmap.h> 33 34 34 - static const u8 max77693_mask_reg[] = { 35 + static const unsigned int max77693_mask_reg[] = { 35 36 [LED_INT] = MAX77693_LED_REG_FLASH_INT_MASK, 36 37 [TOPSYS_INT] = MAX77693_PMIC_REG_TOPSYS_INT_MASK, 37 38 [CHG_INT] = MAX77693_CHG_REG_CHG_INT_MASK, ··· 119 118 continue; 120 119 max77693->irq_masks_cache[i] = max77693->irq_masks_cur[i]; 121 120 122 - max77693_write_reg(map, max77693_mask_reg[i], 121 + regmap_write(map, max77693_mask_reg[i], 123 122 max77693->irq_masks_cur[i]); 124 123 } 125 124 ··· 179 178 { 180 179 struct max77693_dev *max77693 = data; 181 180 u8 irq_reg[MAX77693_IRQ_GROUP_NR] = {}; 182 - u8 irq_src; 181 + unsigned int irq_src; 183 182 int ret; 184 183 int i, cur_irq; 185 184 186 - ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_INTSRC, 185 + ret = regmap_read(max77693->regmap, MAX77693_PMIC_REG_INTSRC, 187 186 &irq_src); 188 187 if (ret < 0) { 189 188 dev_err(max77693->dev, "Failed to read interrupt source: %d\n", ··· 191 190 return IRQ_NONE; 192 191 } 193 192 194 - if (irq_src & MAX77693_IRQSRC_CHG) 193 + if (irq_src & MAX77693_IRQSRC_CHG) { 195 194 /* CHG_INT */ 196 - ret = max77693_read_reg(max77693->regmap, MAX77693_CHG_REG_CHG_INT, 197 - &irq_reg[CHG_INT]); 195 + unsigned int data; 196 + ret = regmap_read(max77693->regmap, 197 + MAX77693_CHG_REG_CHG_INT, &data); 198 + irq_reg[CHG_INT] = data; 199 + } 198 200 199 - if (irq_src & MAX77693_IRQSRC_TOP) 201 + if (irq_src & MAX77693_IRQSRC_TOP) { 200 202 /* TOPSYS_INT */ 201 - ret = max77693_read_reg(max77693->regmap, 202 - MAX77693_PMIC_REG_TOPSYS_INT, &irq_reg[TOPSYS_INT]); 203 + unsigned int data; 204 + ret = regmap_read(max77693->regmap, 205 + MAX77693_PMIC_REG_TOPSYS_INT, &data); 206 + irq_reg[TOPSYS_INT] = data; 207 + } 203 208 204 - if (irq_src & MAX77693_IRQSRC_FLASH) 209 + if (irq_src & MAX77693_IRQSRC_FLASH) { 205 210 /* LED_INT */ 206 - ret = max77693_read_reg(max77693->regmap, 207 - MAX77693_LED_REG_FLASH_INT, &irq_reg[LED_INT]); 211 + unsigned int data; 212 + ret = regmap_read(max77693->regmap, 213 + MAX77693_LED_REG_FLASH_INT, &data); 214 + irq_reg[LED_INT] = data; 215 + } 208 216 209 217 if (irq_src & MAX77693_IRQSRC_MUIC) 210 218 /* MUIC INT1 ~ INT3 */ 211 - max77693_bulk_read(max77693->regmap_muic, MAX77693_MUIC_REG_INT1, 212 - MAX77693_NUM_IRQ_MUIC_REGS, &irq_reg[MUIC_INT1]); 219 + regmap_bulk_read(max77693->regmap_muic, MAX77693_MUIC_REG_INT1, 220 + &irq_reg[MUIC_INT1], MAX77693_NUM_IRQ_MUIC_REGS); 213 221 214 222 /* Apply masking */ 215 223 for (i = 0; i < MAX77693_IRQ_GROUP_NR; i++) { ··· 273 263 struct irq_domain *domain; 274 264 int i; 275 265 int ret = 0; 276 - u8 intsrc_mask; 266 + unsigned int intsrc_mask; 277 267 278 268 mutex_init(&max77693->irqlock); 279 269 ··· 296 286 if (max77693_mask_reg[i] == MAX77693_REG_INVALID) 297 287 continue; 298 288 if (i >= MUIC_INT1 && i <= MUIC_INT3) 299 - max77693_write_reg(map, max77693_mask_reg[i], 0x00); 289 + regmap_write(map, max77693_mask_reg[i], 0x00); 300 290 else 301 - max77693_write_reg(map, max77693_mask_reg[i], 0xff); 291 + regmap_write(map, max77693_mask_reg[i], 0xff); 302 292 } 303 293 304 294 domain = irq_domain_add_linear(NULL, MAX77693_IRQ_NR, ··· 311 301 max77693->irq_domain = domain; 312 302 313 303 /* Unmask max77693 interrupt */ 314 - ret = max77693_read_reg(max77693->regmap, 304 + ret = regmap_read(max77693->regmap, 315 305 MAX77693_PMIC_REG_INTSRC_MASK, &intsrc_mask); 316 306 if (ret < 0) { 317 307 dev_err(max77693->dev, "fail to read PMIC register\n"); ··· 321 311 intsrc_mask &= ~(MAX77693_IRQSRC_CHG); 322 312 intsrc_mask &= ~(MAX77693_IRQSRC_FLASH); 323 313 intsrc_mask &= ~(MAX77693_IRQSRC_MUIC); 324 - ret = max77693_write_reg(max77693->regmap, 314 + ret = regmap_write(max77693->regmap, 325 315 MAX77693_PMIC_REG_INTSRC_MASK, intsrc_mask); 326 316 if (ret < 0) { 327 317 dev_err(max77693->dev, "fail to write PMIC register\n");

+2 -54

drivers/mfd/max77693.c

··· 49 49 { .name = "max77693-haptic", }, 50 50 }; 51 51 52 - int max77693_read_reg(struct regmap *map, u8 reg, u8 *dest) 53 - { 54 - unsigned int val; 55 - int ret; 56 - 57 - ret = regmap_read(map, reg, &val); 58 - *dest = val; 59 - 60 - return ret; 61 - } 62 - EXPORT_SYMBOL_GPL(max77693_read_reg); 63 - 64 - int max77693_bulk_read(struct regmap *map, u8 reg, int count, u8 *buf) 65 - { 66 - int ret; 67 - 68 - ret = regmap_bulk_read(map, reg, buf, count); 69 - 70 - return ret; 71 - } 72 - EXPORT_SYMBOL_GPL(max77693_bulk_read); 73 - 74 - int max77693_write_reg(struct regmap *map, u8 reg, u8 value) 75 - { 76 - int ret; 77 - 78 - ret = regmap_write(map, reg, value); 79 - 80 - return ret; 81 - } 82 - EXPORT_SYMBOL_GPL(max77693_write_reg); 83 - 84 - int max77693_bulk_write(struct regmap *map, u8 reg, int count, u8 *buf) 85 - { 86 - int ret; 87 - 88 - ret = regmap_bulk_write(map, reg, buf, count); 89 - 90 - return ret; 91 - } 92 - EXPORT_SYMBOL_GPL(max77693_bulk_write); 93 - 94 - int max77693_update_reg(struct regmap *map, u8 reg, u8 val, u8 mask) 95 - { 96 - int ret; 97 - 98 - ret = regmap_update_bits(map, reg, mask, val); 99 - 100 - return ret; 101 - } 102 - EXPORT_SYMBOL_GPL(max77693_update_reg); 103 - 104 52 static const struct regmap_config max77693_regmap_config = { 105 53 .reg_bits = 8, 106 54 .val_bits = 8, ··· 65 117 const struct i2c_device_id *id) 66 118 { 67 119 struct max77693_dev *max77693; 68 - u8 reg_data; 120 + unsigned int reg_data; 69 121 int ret = 0; 70 122 71 123 max77693 = devm_kzalloc(&i2c->dev, ··· 87 139 return ret; 88 140 } 89 141 90 - ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2, 142 + ret = regmap_read(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2, 91 143 &reg_data); 92 144 if (ret < 0) { 93 145 dev_err(max77693->dev, "device not found on this channel\n");

+6 -6

drivers/regulator/max77693.c

··· 31 31 #include <linux/mfd/max77693.h> 32 32 #include <linux/mfd/max77693-private.h> 33 33 #include <linux/regulator/of_regulator.h> 34 + #include <linux/regmap.h> 34 35 35 36 #define CHGIN_ILIM_STEP_20mA 20000 36 37 ··· 40 39 static int max77693_chg_is_enabled(struct regulator_dev *rdev) 41 40 { 42 41 int ret; 43 - u8 val; 42 + unsigned int val; 44 43 45 - ret = max77693_read_reg(rdev->regmap, rdev->desc->enable_reg, &val); 44 + ret = regmap_read(rdev->regmap, rdev->desc->enable_reg, &val); 46 45 if (ret) 47 46 return ret; 48 47 ··· 58 57 { 59 58 unsigned int chg_min_uA = rdev->constraints->min_uA; 60 59 unsigned int chg_max_uA = rdev->constraints->max_uA; 61 - u8 reg, sel; 60 + unsigned int reg, sel; 62 61 unsigned int val; 63 62 int ret; 64 63 65 - ret = max77693_read_reg(rdev->regmap, 66 - MAX77693_CHG_REG_CHG_CNFG_09, &reg); 64 + ret = regmap_read(rdev->regmap, MAX77693_CHG_REG_CHG_CNFG_09, &reg); 67 65 if (ret < 0) 68 66 return ret; 69 67 ··· 96 96 /* the first four codes for charger current are all 60mA */ 97 97 sel += 3; 98 98 99 - return max77693_write_reg(rdev->regmap, 99 + return regmap_write(rdev->regmap, 100 100 MAX77693_CHG_REG_CHG_CNFG_09, sel); 101 101 } 102 102 /* end of CHARGER regulator ops */

-8

include/linux/mfd/max77693-private.h

··· 332 332 TYPE_MAX77693, 333 333 }; 334 334 335 - extern int max77693_read_reg(struct regmap *map, u8 reg, u8 *dest); 336 - extern int max77693_bulk_read(struct regmap *map, u8 reg, int count, 337 - u8 *buf); 338 - extern int max77693_write_reg(struct regmap *map, u8 reg, u8 value); 339 - extern int max77693_bulk_write(struct regmap *map, u8 reg, int count, 340 - u8 *buf); 341 - extern int max77693_update_reg(struct regmap *map, u8 reg, u8 val, u8 mask); 342 - 343 335 extern int max77693_irq_init(struct max77693_dev *max77686); 344 336 extern void max77693_irq_exit(struct max77693_dev *max77686); 345 337 extern int max77693_irq_resume(struct max77693_dev *max77686);