Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3df22c06 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Bryan Wu
Browse files

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: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarBryan Wu <cooloney@gmail.com>
parent 01a7a063

drivers/leds/leds-mc13783.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -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,18 +162,11 @@ 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;

	}

	mc13xxx_unlock(mcdev);



	if (ret) {

		dev_err(&pdev->dev, "Unable to init LED driver\n");

			return ret;

			return ret;

	}

	}
@@ -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;

}

}