mirror of
https://github.com/torvalds/linux.git
synced 2026-05-17 19:17:29 +02:00
Allwinner SoC driver changes for 6.12
- Simplify sunxi-rsb driver probe function using dev_err_probe() -----BEGIN PGP SIGNATURE----- iQJCBAABCgAsFiEE2nN1m/hhnkhOWjtHOJpUIZwPJDAFAmbZ1xwOHHdlbnNAY3Np ZS5vcmcACgkQOJpUIZwPJDBiUhAA5vhax3EY//8dML3vLZ8rRIc+w8sKum2ED2BR wHDDdvf28THU1FpMMOHZmGbMtKncH+9mCh35bJCJCQ0SFoqPQya2YTiHqY2LIQkz wcxeY6uVwZ/rmZgn/tAknds9vmdgSaYkLk51vYatc16MH0YGEoAPuUdWDuXxaaNK O9o8LEiFob8XjV+vUQXQPaiFah09Nn3DI+xXZkp8ulqEeF3G/NbCT2KlTlaiXnRP mWkGJDyv3wAOKnBs6fC92yGci7W1NudEO6tJi2yXamJ6q0AD5OZ/rSbHMhkYcORK bf+8SF7ejPosMmV8o4bdMa0lMwuC07y8ZZHDytz0ED7uxRfhWmCkl8XJjEoNU94X hlJMWIdErzVtSHtEROIRT44SGRPhrC2a0/qklYhVABMtMxVUIbsoOMd5Ws+EnobH 6Dojj+BwF31DaUpDdrNpms3WZ2m8BX8GThne059C0PJqoRIxlQHZMnfTgOBp4oMU eSFOjVNlT0T5kvVobS+fT6Ts36lr5p4R8ZupAmUT4Uc/SaC6PH1y/lf0naXdw+wI j2R5ZsYrUMjLxOV+/8izEcDVU8Kin00BZG+x+Im8VpSlhUw3vg8h8RxQ9qpLoexm nN/e1TnU1O9a3US8tANAEV61Ri1WFhFIS+KoaP9r12fGVOyURHHAqKIPoA3eOU78 INNSjlM= =FTdM -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmbaDG4ACgkQYKtH/8kJ Uicl+xAA1FWhS3L6ayUusj6H4AsfrNRW71EUuCAfZF23bI6EoAIhAfu6AVSSZ01T 5roSkKaK1FT6hGvUujPNQHQ+bjsMdmlY5DHgkLQnwmWiufnnPx4jEC/G5ji4sjSA 6sJ1z9eXczoPFtUsYw7/daOkJ66CByuTbC5O82QiCcjJDoUCApb1SM3nf0noWNf4 rfaZioh4GAoHkO3LIxDRpFF09RtK4/XT9Cy+EGpFJeYZbZS4gi9b7F2Y4Rwg0lJm PD2QkatO1FQMrSX4O9lF04T9Jc5XOOtxNzS8Uk3lY4nD7wYSZ6U259eWmYMMDRXD s3tgpQKNJZsDK0YdgyQzmcoOLTV19HCU4Kg16RNsmelNY+8omt49a7bAC+zOqAeP nJ/RYn+LPlsXiJLhhLjmw3qVsmhzJix+F5RHg8oFr5fumkURg0wlU++IPLA4Fgue IjRn6B0dHu54vRYwS+5JEH9mSD8KgHmzDTrn3FFB2hN6+7TH+kjWl+xHhct/pF/9 Q4TlMouKopG1uvIyu+OIhoiMujf8XCkV+FS81g1gMILNY1HtzlikzJI5clarx6oh u8/pJu0BE09glhmBXd5uD2RrQdFZaHD1wEGU800riNol+9CIjrfvI3wyiZwMuRY6 qPqQjBJGFuhaaLrirtUyTW9gKvAzO3OZrAkBMfgSY5StJ1QbW3c= =RAlL -----END PGP SIGNATURE----- Merge tag 'sunxi-drivers-for-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/drivers Allwinner SoC driver changes for 6.12 - Simplify sunxi-rsb driver probe function using dev_err_probe() * tag 'sunxi-drivers-for-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: bus: sunxi-rsb: Simplify code with dev_err_probe() Link: https://lore.kernel.org/r/ZtnYUswjHdLRYq8Y@wens.tw Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
fc282a6643
|
|
@ -751,12 +751,10 @@ static int sunxi_rsb_probe(struct platform_device *pdev)
|
|||
int irq, ret;
|
||||
|
||||
of_property_read_u32(np, "clock-frequency", &clk_freq);
|
||||
if (clk_freq > RSB_MAX_FREQ) {
|
||||
dev_err(dev,
|
||||
"clock-frequency (%u Hz) is too high (max = 20MHz)\n",
|
||||
clk_freq);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (clk_freq > RSB_MAX_FREQ)
|
||||
return dev_err_probe(dev, -EINVAL,
|
||||
"clock-frequency (%u Hz) is too high (max = 20MHz)\n",
|
||||
clk_freq);
|
||||
|
||||
rsb = devm_kzalloc(dev, sizeof(*rsb), GFP_KERNEL);
|
||||
if (!rsb)
|
||||
|
|
@ -774,28 +772,22 @@ static int sunxi_rsb_probe(struct platform_device *pdev)
|
|||
return irq;
|
||||
|
||||
rsb->clk = devm_clk_get(dev, NULL);
|
||||
if (IS_ERR(rsb->clk)) {
|
||||
ret = PTR_ERR(rsb->clk);
|
||||
dev_err(dev, "failed to retrieve clk: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
if (IS_ERR(rsb->clk))
|
||||
return dev_err_probe(dev, PTR_ERR(rsb->clk),
|
||||
"failed to retrieve clk\n");
|
||||
|
||||
rsb->rstc = devm_reset_control_get(dev, NULL);
|
||||
if (IS_ERR(rsb->rstc)) {
|
||||
ret = PTR_ERR(rsb->rstc);
|
||||
dev_err(dev, "failed to retrieve reset controller: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
if (IS_ERR(rsb->rstc))
|
||||
return dev_err_probe(dev, PTR_ERR(rsb->rstc),
|
||||
"failed to retrieve reset controller\n");
|
||||
|
||||
init_completion(&rsb->complete);
|
||||
mutex_init(&rsb->lock);
|
||||
|
||||
ret = devm_request_irq(dev, irq, sunxi_rsb_irq, 0, RSB_CTRL_NAME, rsb);
|
||||
if (ret) {
|
||||
dev_err(dev, "can't register interrupt handler irq %d: %d\n",
|
||||
irq, ret);
|
||||
return ret;
|
||||
}
|
||||
if (ret)
|
||||
return dev_err_probe(dev, ret,
|
||||
"can't register interrupt handler irq %d\n", irq);
|
||||
|
||||
ret = sunxi_rsb_hw_init(rsb);
|
||||
if (ret)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user