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

staging: nvec: cleanup use of dev in probe function

This cleanups the probe function a bit by using a dev variable instead
of &pdev-dev.

Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Marc Dietrich and committed by
Greg Kroah-Hartman d4381795 3c31e04b

+18 -17
+18 -17
drivers/staging/nvec/nvec.c
··· 786 786 { 787 787 int err, ret; 788 788 struct clk *i2c_clk; 789 + struct device *dev = &pdev->dev; 789 790 struct nvec_chip *nvec; 790 791 struct nvec_msg *msg; 791 792 struct resource *res; ··· 795 794 unmute_speakers[] = { NVEC_OEM0, 0x10, 0x59, 0x95 }, 796 795 enable_event[7] = { NVEC_SYS, CNF_EVENT_REPORTING, true }; 797 796 798 - if (!pdev->dev.of_node) { 799 - dev_err(&pdev->dev, "must be instantiated using device tree\n"); 797 + if (!dev->of_node) { 798 + dev_err(dev, "must be instantiated using device tree\n"); 800 799 return -ENODEV; 801 800 } 802 801 803 - nvec = devm_kzalloc(&pdev->dev, sizeof(struct nvec_chip), GFP_KERNEL); 802 + nvec = devm_kzalloc(dev, sizeof(struct nvec_chip), GFP_KERNEL); 804 803 if (!nvec) 805 804 return -ENOMEM; 806 805 807 806 platform_set_drvdata(pdev, nvec); 808 - nvec->dev = &pdev->dev; 807 + nvec->dev = dev; 809 808 810 809 err = nvec_i2c_parse_dt_pdata(nvec); 811 810 if (err < 0) 812 811 return err; 813 812 814 813 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 815 - base = devm_ioremap_resource(&pdev->dev, res); 814 + base = devm_ioremap_resource(dev, res); 816 815 if (IS_ERR(base)) 817 816 return PTR_ERR(base); 818 817 819 818 nvec->irq = platform_get_irq(pdev, 0); 820 819 if (nvec->irq < 0) { 821 - dev_err(&pdev->dev, "no irq resource?\n"); 820 + dev_err(dev, "no irq resource?\n"); 822 821 return -ENODEV; 823 822 } 824 823 825 - i2c_clk = devm_clk_get(&pdev->dev, "div-clk"); 824 + i2c_clk = devm_clk_get(dev, "div-clk"); 826 825 if (IS_ERR(i2c_clk)) { 827 - dev_err(nvec->dev, "failed to get controller clock\n"); 826 + dev_err(dev, "failed to get controller clock\n"); 828 827 return -ENODEV; 829 828 } 830 829 831 - nvec->rst = devm_reset_control_get_exclusive(&pdev->dev, "i2c"); 830 + nvec->rst = devm_reset_control_get_exclusive(dev, "i2c"); 832 831 if (IS_ERR(nvec->rst)) { 833 - dev_err(nvec->dev, "failed to get controller reset\n"); 832 + dev_err(dev, "failed to get controller reset\n"); 834 833 return PTR_ERR(nvec->rst); 835 834 } 836 835 ··· 850 849 INIT_WORK(&nvec->rx_work, nvec_dispatch); 851 850 INIT_WORK(&nvec->tx_work, nvec_request_master); 852 851 853 - err = devm_gpio_request_one(&pdev->dev, nvec->gpio, GPIOF_OUT_INIT_HIGH, 852 + err = devm_gpio_request_one(dev, nvec->gpio, GPIOF_OUT_INIT_HIGH, 854 853 "nvec gpio"); 855 854 if (err < 0) { 856 - dev_err(nvec->dev, "couldn't request gpio\n"); 855 + dev_err(dev, "couldn't request gpio\n"); 857 856 return -ENODEV; 858 857 } 859 858 860 - err = devm_request_irq(&pdev->dev, nvec->irq, nvec_interrupt, 0, 859 + err = devm_request_irq(dev, nvec->irq, nvec_interrupt, 0, 861 860 "nvec", nvec); 862 861 if (err) { 863 - dev_err(nvec->dev, "couldn't request irq\n"); 862 + dev_err(dev, "couldn't request irq\n"); 864 863 return -ENODEV; 865 864 } 866 865 disable_irq(nvec->irq); ··· 880 879 err = nvec_write_sync(nvec, get_firmware_version, 2, &msg); 881 880 882 881 if (!err) { 883 - dev_warn(nvec->dev, 882 + dev_warn(dev, 884 883 "ec firmware version %02x.%02x.%02x / %02x\n", 885 884 msg->data[4], msg->data[5], 886 885 msg->data[6], msg->data[7]); ··· 888 887 nvec_msg_free(nvec, msg); 889 888 } 890 889 891 - ret = mfd_add_devices(nvec->dev, 0, nvec_devices, 890 + ret = mfd_add_devices(dev, 0, nvec_devices, 892 891 ARRAY_SIZE(nvec_devices), NULL, 0, NULL); 893 892 if (ret) 894 - dev_err(nvec->dev, "error adding subdevices\n"); 893 + dev_err(dev, "error adding subdevices\n"); 895 894 896 895 /* unmute speakers? */ 897 896 nvec_write_async(nvec, unmute_speakers, 4);