media: Revert "media: atomisp: Add some ACPI detection info"

This reverts commit 0d64e9420583cbc3c4a3f949ebe38fd8f7769281.

As gmin_subdev_add() now takes the ACPI handle directly,
we can deprecate the code that were doing this inside each
I2C driver.

PS.: This also reverts commit c03496b3bd92 ("media: atomisp: add a notice about possible leak resources")

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
index 3fbd585..2b71de7 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
@@ -1310,17 +1310,6 @@ static int gc0310_probe(struct i2c_client *client)
        int ret;
        void *pdata;
        unsigned int i;
-       acpi_handle handle;
-       struct acpi_device *adev;
-
-       handle = ACPI_HANDLE(&client->dev);
-       if (!handle || acpi_bus_get_device(handle, &adev)) {
-               dev_err(&client->dev, "Error could not get ACPI device\n");
-               return -ENODEV;
-       }
-       pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
-               __func__, acpi_device_bid(adev), acpi_device_hid(adev));
-       // FIXME: may need to release resources allocated by acpi_bus_get_device()
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (!dev)

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
index ae36dd4..78147ff 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
@@ -1052,17 +1052,6 @@ static int gc2235_probe(struct i2c_client *client)
        void *gcpdev;
        int ret;
        unsigned int i;
-       acpi_handle handle;
-       struct acpi_device *adev;
-
-       handle = ACPI_HANDLE(&client->dev);
-       if (!handle || acpi_bus_get_device(handle, &adev)) {
-               dev_err(&client->dev, "Error could not get ACPI device\n");
-               return -ENODEV;
-       }
-       pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
-               __func__, acpi_device_bid(adev), acpi_device_hid(adev));
-       // FIXME: may need to release resources allocated by acpi_bus_get_device()
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (!dev)

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
index 85c90c6..809010a 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
@@ -851,17 +851,6 @@ static int lm3554_probe(struct i2c_client *client)
        struct lm3554 *flash;
        unsigned int i;
        int ret;
-       acpi_handle handle;
-       struct acpi_device *adev;
-
-       handle = ACPI_HANDLE(&client->dev);
-       if (!handle || acpi_bus_get_device(handle, &adev)) {
-               dev_err(&client->dev, "Error could not get ACPI device\n");
-               return -ENODEV;
-       }
-       pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
-               __func__, acpi_device_bid(adev), acpi_device_hid(adev));
-       // FIXME: may need to release resources allocated by acpi_bus_get_device()
 
        flash = kzalloc(sizeof(*flash), GFP_KERNEL);
        if (!flash)

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
index a76031f..0d60918 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
@@ -1817,17 +1817,6 @@ static int mt9m114_probe(struct i2c_client *client)
        int ret = 0;
        unsigned int i;
        void *pdata;
-       acpi_handle handle;
-       struct acpi_device *adev;
-
-       handle = ACPI_HANDLE(&client->dev);
-       if (!handle || acpi_bus_get_device(handle, &adev)) {
-               dev_err(&client->dev, "Error could not get ACPI device\n");
-               return -ENODEV;
-       }
-       pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
-               __func__, acpi_device_bid(adev), acpi_device_hid(adev));
-       // FIXME: may need to release resources allocated by acpi_bus_get_device()
 
        /* Setup sensor configuration structure */
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
index 8f54835..90d125b 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
@@ -1244,17 +1244,6 @@ static int ov2680_probe(struct i2c_client *client)
        int ret;
        void *pdata;
        unsigned int i;
-       acpi_handle handle;
-       struct acpi_device *adev;
-
-       handle = ACPI_HANDLE(&client->dev);
-       if (!handle || acpi_bus_get_device(handle, &adev)) {
-               dev_err(&client->dev, "Error could not get ACPI device\n");
-               return -ENODEV;
-       }
-       dev_info(&client->dev, "%s: ACPI detected it on bus ID=%s, HID=%s\n",
-               __func__, acpi_device_bid(adev), acpi_device_hid(adev));
-       // FIXME: may need to release resources allocated by acpi_bus_get_device()
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (!dev)

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
index 9f3e99b..eecefcd 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
@@ -1215,17 +1215,6 @@ static int ov2722_probe(struct i2c_client *client)
        struct ov2722_device *dev;
        void *ovpdev;
        int ret;
-       acpi_handle handle;
-       struct acpi_device *adev;
-
-       handle = ACPI_HANDLE(&client->dev);
-       if (!handle || acpi_bus_get_device(handle, &adev)) {
-               dev_err(&client->dev, "Error could not get ACPI device\n");
-               return -ENODEV;
-       }
-       pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
-               __func__, acpi_device_bid(adev), acpi_device_hid(adev));
-       // FIXME: may need to release resources allocated by acpi_bus_get_device()
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (!dev)

diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
index da5b1a3..97ab10b 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
+++ b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
@@ -1902,17 +1902,6 @@ static int ov5693_probe(struct i2c_client *client)
        int ret = 0;
        void *pdata;
        unsigned int i;
-       acpi_handle handle;
-       struct acpi_device *adev;
-
-       handle = ACPI_HANDLE(&client->dev);
-       if (!handle || acpi_bus_get_device(handle, &adev)) {
-               dev_err(&client->dev, "Error could not get ACPI device\n");
-               return -ENODEV;
-       }
-       pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
-               __func__, acpi_device_bid(adev), acpi_device_hid(adev));
-       // FIXME: may need to release resources allocated by acpi_bus_get_device()
 
        /*
         * Firmware workaround: Some modules use a "secondary default"