]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
media: atomisp: Use temporary variable for device in gmin_subdev_add()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 29 Jun 2020 10:57:36 +0000 (12:57 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Sat, 18 Jul 2020 05:23:54 +0000 (07:23 +0200)
Use temporary variable for device in gmin_subdev_add().

While here, drop unused temporary variable for device in other places.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c

index efd5e92ad7f6838c7e728cf55a1abaf0c8c27ad8..dc34c7e0d84566d66bf920c83b93d7b94c236e0b 100644 (file)
@@ -514,19 +514,14 @@ static int gmin_detect_pmic(struct v4l2_subdev *subdev)
 static struct gmin_subdev *gmin_subdev_add(struct v4l2_subdev *subdev)
 {
        struct i2c_client *client = v4l2_get_subdevdata(subdev);
+       struct device *dev = &client->dev;
        struct acpi_device *adev;
        struct gmin_subdev *gs;
        acpi_handle handle;
-       struct device *dev;
        int i, ret, clock_num = -1;
 
-       if (!client)
-               return NULL;
-
-       dev = &client->dev;
-
        handle = ACPI_HANDLE(dev);
-       adev = ACPI_COMPANION(&client->dev);
+       adev = ACPI_COMPANION(dev);
 
        dev_info(&client->dev, "%s: ACPI detected it on bus ID=%s, HID=%s\n",
                __func__, acpi_device_bid(adev), acpi_device_hid(adev));
@@ -829,12 +824,8 @@ static int gmin_v1p8_ctrl(struct v4l2_subdev *subdev, int on)
 {
        struct gmin_subdev *gs = find_gmin_subdev(subdev);
        int ret;
-       struct device *dev;
-       struct i2c_client *client = v4l2_get_subdevdata(subdev);
        int value;
 
-       dev = &client->dev;
-
        if (gs->v1p8_gpio >= 0) {
                pr_info("atomisp_gmin_platform: 1.8v power on GPIO %d\n",
                        gs->v1p8_gpio);
@@ -887,12 +878,8 @@ static int gmin_v2p8_ctrl(struct v4l2_subdev *subdev, int on)
 {
        struct gmin_subdev *gs = find_gmin_subdev(subdev);
        int ret;
-       struct device *dev;
-       struct i2c_client *client = v4l2_get_subdevdata(subdev);
        int value;
 
-       dev = &client->dev;
-
        if (gs->v2p8_gpio >= 0) {
                pr_info("atomisp_gmin_platform: 2.8v power on GPIO %d\n",
                        gs->v2p8_gpio);