tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iio: adc: rockchip: Simplify probe() with local 'dev'

Simplify the probe function by using a local 'dev' variable instead of
full pointer dereference. This makes several lines shorter, which
allows to avoid wrapping making code more readable.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Krzysztof Kozlowski and committed by
Jonathan Cameron d8011335 5b758ebc

+22 -28
+22 -28
drivers/iio/adc/rockchip_saradc.c
··· 456 456 { 457 457 const struct rockchip_saradc_data *match_data; 458 458 struct rockchip_saradc *info = NULL; 459 + struct device *dev = &pdev->dev; 459 460 struct device_node *np = pdev->dev.of_node; 460 461 struct iio_dev *indio_dev = NULL; 461 462 int ret; ··· 465 464 if (!np) 466 465 return -ENODEV; 467 466 468 - indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*info)); 467 + indio_dev = devm_iio_device_alloc(dev, sizeof(*info)); 469 468 if (!indio_dev) 470 469 return -ENOMEM; 471 470 472 471 info = iio_priv(indio_dev); 473 472 474 - match_data = of_device_get_match_data(&pdev->dev); 473 + match_data = of_device_get_match_data(dev); 475 474 if (!match_data) 476 - return dev_err_probe(&pdev->dev, -ENODEV, 477 - "failed to match device\n"); 475 + return dev_err_probe(dev, -ENODEV, "failed to match device\n"); 478 476 479 477 info->data = match_data; 480 478 481 479 /* Sanity check for possible later IP variants with more channels */ 482 480 if (info->data->num_channels > SARADC_MAX_CHANNELS) 483 - return dev_err_probe(&pdev->dev, -EINVAL, 484 - "max channels exceeded"); 481 + return dev_err_probe(dev, -EINVAL, "max channels exceeded"); 485 482 486 483 info->regs = devm_platform_ioremap_resource(pdev, 0); 487 484 if (IS_ERR(info->regs)) ··· 489 490 * The reset should be an optional property, as it should work 490 491 * with old devicetrees as well 491 492 */ 492 - info->reset = devm_reset_control_get_optional_exclusive(&pdev->dev, 493 - "saradc-apb"); 493 + info->reset = devm_reset_control_get_optional_exclusive(dev, "saradc-apb"); 494 494 if (IS_ERR(info->reset)) 495 - return dev_err_probe(&pdev->dev, PTR_ERR(info->reset), 495 + return dev_err_probe(dev, PTR_ERR(info->reset), 496 496 "failed to get saradc-apb\n"); 497 497 498 498 init_completion(&info->completion); ··· 500 502 if (irq < 0) 501 503 return irq; 502 504 503 - ret = devm_request_irq(&pdev->dev, irq, rockchip_saradc_isr, 505 + ret = devm_request_irq(dev, irq, rockchip_saradc_isr, 504 506 0, dev_name(&pdev->dev), info); 505 507 if (ret < 0) 506 - return dev_err_probe(&pdev->dev, ret, "failed requesting irq %d\n", irq); 508 + return dev_err_probe(dev, ret, "failed requesting irq %d\n", irq); 507 509 508 - info->vref = devm_regulator_get(&pdev->dev, "vref"); 510 + info->vref = devm_regulator_get(dev, "vref"); 509 511 if (IS_ERR(info->vref)) 510 - return dev_err_probe(&pdev->dev, PTR_ERR(info->vref), 512 + return dev_err_probe(dev, PTR_ERR(info->vref), 511 513 "failed to get regulator\n"); 512 514 513 515 if (info->reset) ··· 515 517 516 518 ret = regulator_enable(info->vref); 517 519 if (ret < 0) 518 - return dev_err_probe(&pdev->dev, ret, 519 - "failed to enable vref regulator\n"); 520 + return dev_err_probe(dev, ret, "failed to enable vref regulator\n"); 520 521 521 - ret = devm_add_action_or_reset(&pdev->dev, 522 - rockchip_saradc_regulator_disable, info); 522 + ret = devm_add_action_or_reset(dev, rockchip_saradc_regulator_disable, info); 523 523 if (ret) 524 524 return ret; 525 525 ··· 527 531 528 532 info->uv_vref = ret; 529 533 530 - info->pclk = devm_clk_get_enabled(&pdev->dev, "apb_pclk"); 534 + info->pclk = devm_clk_get_enabled(dev, "apb_pclk"); 531 535 if (IS_ERR(info->pclk)) 532 - return dev_err_probe(&pdev->dev, PTR_ERR(info->pclk), 533 - "failed to get pclk\n"); 536 + return dev_err_probe(dev, PTR_ERR(info->pclk), "failed to get pclk\n"); 534 537 535 - info->clk = devm_clk_get_enabled(&pdev->dev, "saradc"); 538 + info->clk = devm_clk_get_enabled(dev, "saradc"); 536 539 if (IS_ERR(info->clk)) 537 - return dev_err_probe(&pdev->dev, PTR_ERR(info->clk), 540 + return dev_err_probe(dev, PTR_ERR(info->clk), 538 541 "failed to get adc clock\n"); 539 542 /* 540 543 * Use a default value for the converter clock. ··· 541 546 */ 542 547 ret = clk_set_rate(info->clk, info->data->clk_rate); 543 548 if (ret < 0) 544 - return dev_err_probe(&pdev->dev, ret, 545 - "failed to set adc clk rate\n"); 549 + return dev_err_probe(dev, ret, "failed to set adc clk rate\n"); 546 550 547 551 platform_set_drvdata(pdev, indio_dev); 548 552 549 - indio_dev->name = dev_name(&pdev->dev); 553 + indio_dev->name = dev_name(dev); 550 554 indio_dev->info = &rockchip_saradc_iio_info; 551 555 indio_dev->modes = INDIO_DIRECT_MODE; 552 556 553 557 indio_dev->channels = info->data->channels; 554 558 indio_dev->num_channels = info->data->num_channels; 555 - ret = devm_iio_triggered_buffer_setup(&indio_dev->dev, indio_dev, NULL, 559 + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, 556 560 rockchip_saradc_trigger_handler, 557 561 NULL); 558 562 if (ret) ··· 562 568 if (ret) 563 569 return ret; 564 570 565 - ret = devm_add_action_or_reset(&pdev->dev, 571 + ret = devm_add_action_or_reset(dev, 566 572 rockchip_saradc_regulator_unreg_notifier, 567 573 info); 568 574 if (ret) ··· 570 576 571 577 mutex_init(&info->lock); 572 578 573 - return devm_iio_device_register(&pdev->dev, indio_dev); 579 + return devm_iio_device_register(dev, indio_dev); 574 580 } 575 581 576 582 static int rockchip_saradc_suspend(struct device *dev)