mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
hte: Changes for v7.4-rc1
Updates minor fixes as follows: - prevent releasing GPIO before time expires in the test code - initialize spin lock before registering the chip in the provider driver -----BEGIN PGP SIGNATURE----- iIgEABYIADAWIQT4slW2T0Q/rXAa29f4pUxhzZTZKAUCate4XBIcZGlwZW5wQG52 aWRpYS5jb20ACgkQ+KVMYc2U2Sh+/wEAlQXPXTpMRzciYVInxh+61PMSpenM2oEq rb1P2v6lTRkBAOc0/xHcmDyiEjxX4zFlPW9I6QBwbQJxpIRI48xya/AC =Wohn -----END PGP SIGNATURE----- Merge tag 'for-7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux Pull hte updates from Dipen Patel: - prevent releasing GPIO before time expires in the test code - initialize spin lock before registering the chip in the provider driver * tag 'for-7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux: hte: tegra194-test: shut down timer before GPIO release hte: tegra194: Initialize slice locks before registering chip hte: tegra194: Remove redundant dev_err()
This commit is contained in:
commit
8279fb3005
|
|
@ -217,10 +217,10 @@ static void tegra_hte_test_remove(struct platform_device *pdev)
|
|||
{
|
||||
(void)pdev;
|
||||
|
||||
timer_shutdown_sync(&hte.timer);
|
||||
free_irq(hte.gpio_in_irq, &hte);
|
||||
gpiod_put(hte.gpio_in);
|
||||
gpiod_put(hte.gpio_out);
|
||||
timer_delete_sync(&hte.timer);
|
||||
}
|
||||
|
||||
static struct platform_driver tegra_hte_test_driver = {
|
||||
|
|
|
|||
|
|
@ -856,10 +856,8 @@ static int tegra_hte_probe(struct platform_device *pdev)
|
|||
hte_dev->hte_irq = ret;
|
||||
ret = devm_request_irq(dev, hte_dev->hte_irq, tegra_hte_isr, 0,
|
||||
dev_name(dev), hte_dev);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "request irq failed.\n");
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
gc->nlines = nlines;
|
||||
gc->ops = &g_ops;
|
||||
|
|
@ -910,17 +908,17 @@ static int tegra_hte_probe(struct platform_device *pdev)
|
|||
|
||||
hte_dev->chip = gc;
|
||||
|
||||
for (i = 0; i < slices; i++) {
|
||||
hte_dev->sl[i].flags = 0;
|
||||
spin_lock_init(&hte_dev->sl[i].s_lock);
|
||||
}
|
||||
|
||||
ret = devm_hte_register_chip(hte_dev->chip);
|
||||
if (ret) {
|
||||
dev_err(gc->dev, "hte chip register failed");
|
||||
return ret;
|
||||
}
|
||||
|
||||
for (i = 0; i < slices; i++) {
|
||||
hte_dev->sl[i].flags = 0;
|
||||
spin_lock_init(&hte_dev->sl[i].s_lock);
|
||||
}
|
||||
|
||||
val = HTE_TECTRL_ENABLE_ENABLE |
|
||||
(HTE_TECTRL_INTR_ENABLE << HTE_TECTRL_INTR_SHIFT) |
|
||||
(hte_dev->itr_thrshld << HTE_TECTRL_OCCU_SHIFT);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user