hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

leds: leds-mc13783: Remove unneeded mc13xxx_{un}lock 

LED registers are used only in this driver, so no additional
locking is needed. Read-Modify-Write cycle in workqueue is already
protected by regmap.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
This commit is contained in:
Alexander Shiyan 2013-12-06 22:22:19 -08:00 committed by Bryan Wu
parent 01a7a063e8
commit 3df22c06b9
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/leds/leds-mc13783.c
View File

@ -117,9 +117,7 @@ static void mc13xxx_led_work(struct work_struct *work)
BUG(); BUG();
} }
mc13xxx_lock(led->master);
mc13xxx_reg_rmw(led->master, reg, mask << shift, value << shift); mc13xxx_reg_rmw(led->master, reg, mask << shift, value << shift);
mc13xxx_unlock(led->master);
} }
static void mc13xxx_led_set(struct led_classdev *led_cdev, static void mc13xxx_led_set(struct led_classdev *led_cdev,
@ -164,19 +162,12 @@ static int __init mc13xxx_led_probe(struct platform_device *pdev)
leds->num_leds = num_leds; leds->num_leds = num_leds;
platform_set_drvdata(pdev, leds); platform_set_drvdata(pdev, leds);
mc13xxx_lock(mcdev);
for (i = 0; i < devtype->num_regs; i++) { for (i = 0; i < devtype->num_regs; i++) {
reg = pdata->led_control[i]; reg = pdata->led_control[i];
WARN_ON(reg >= (1 << 24)); WARN_ON(reg >= (1 << 24));
ret = mc13xxx_reg_write(mcdev, MC13XXX_REG_LED_CONTROL(i), reg); ret = mc13xxx_reg_write(mcdev, MC13XXX_REG_LED_CONTROL(i), reg);
if (ret) if (ret)
break; return ret;
}
mc13xxx_unlock(mcdev);
if (ret) {
dev_err(&pdev->dev, "Unable to init LED driver\n");
return ret;
} }
for (i = 0; i < num_leds; i++) { for (i = 0; i < num_leds; i++) {
@ -237,10 +228,8 @@ static int mc13xxx_led_remove(struct platform_device *pdev)
cancel_work_sync(&leds->led[i].work); cancel_work_sync(&leds->led[i].work);
} }
mc13xxx_lock(mcdev);
for (i = 0; i < leds->devtype->num_regs; i++) for (i = 0; i < leds->devtype->num_regs; i++)
mc13xxx_reg_write(mcdev, MC13XXX_REG_LED_CONTROL(i), 0); mc13xxx_reg_write(mcdev, MC13XXX_REG_LED_CONTROL(i), 0);
mc13xxx_unlock(mcdev);
return 0; return 0;
} }