Skip to content

Commit fc9bfbc

Browse files
committed
media: Revert "media: atomisp: Add some ACPI detection info"
This reverts commit 0d64e94. 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 c03496b ("media: atomisp: add a notice about possible leak resources") Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 387041c commit fc9bfbc

File tree

7 files changed

+0
-77
lines changed

7 files changed

+0
-77
lines changed

drivers/staging/media/atomisp/i2c/atomisp-gc0310.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,17 +1310,6 @@ static int gc0310_probe(struct i2c_client *client)
13101310
int ret;
13111311
void *pdata;
13121312
unsigned int i;
1313-
acpi_handle handle;
1314-
struct acpi_device *adev;
1315-
1316-
handle = ACPI_HANDLE(&client->dev);
1317-
if (!handle || acpi_bus_get_device(handle, &adev)) {
1318-
dev_err(&client->dev, "Error could not get ACPI device\n");
1319-
return -ENODEV;
1320-
}
1321-
pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
1322-
__func__, acpi_device_bid(adev), acpi_device_hid(adev));
1323-
// FIXME: may need to release resources allocated by acpi_bus_get_device()
13241313

13251314
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
13261315
if (!dev)

drivers/staging/media/atomisp/i2c/atomisp-gc2235.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,17 +1052,6 @@ static int gc2235_probe(struct i2c_client *client)
10521052
void *gcpdev;
10531053
int ret;
10541054
unsigned int i;
1055-
acpi_handle handle;
1056-
struct acpi_device *adev;
1057-
1058-
handle = ACPI_HANDLE(&client->dev);
1059-
if (!handle || acpi_bus_get_device(handle, &adev)) {
1060-
dev_err(&client->dev, "Error could not get ACPI device\n");
1061-
return -ENODEV;
1062-
}
1063-
pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
1064-
__func__, acpi_device_bid(adev), acpi_device_hid(adev));
1065-
// FIXME: may need to release resources allocated by acpi_bus_get_device()
10661055

10671056
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
10681057
if (!dev)

drivers/staging/media/atomisp/i2c/atomisp-lm3554.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -851,17 +851,6 @@ static int lm3554_probe(struct i2c_client *client)
851851
struct lm3554 *flash;
852852
unsigned int i;
853853
int ret;
854-
acpi_handle handle;
855-
struct acpi_device *adev;
856-
857-
handle = ACPI_HANDLE(&client->dev);
858-
if (!handle || acpi_bus_get_device(handle, &adev)) {
859-
dev_err(&client->dev, "Error could not get ACPI device\n");
860-
return -ENODEV;
861-
}
862-
pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
863-
__func__, acpi_device_bid(adev), acpi_device_hid(adev));
864-
// FIXME: may need to release resources allocated by acpi_bus_get_device()
865854

866855
flash = kzalloc(sizeof(*flash), GFP_KERNEL);
867856
if (!flash)

drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1817,17 +1817,6 @@ static int mt9m114_probe(struct i2c_client *client)
18171817
int ret = 0;
18181818
unsigned int i;
18191819
void *pdata;
1820-
acpi_handle handle;
1821-
struct acpi_device *adev;
1822-
1823-
handle = ACPI_HANDLE(&client->dev);
1824-
if (!handle || acpi_bus_get_device(handle, &adev)) {
1825-
dev_err(&client->dev, "Error could not get ACPI device\n");
1826-
return -ENODEV;
1827-
}
1828-
pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
1829-
__func__, acpi_device_bid(adev), acpi_device_hid(adev));
1830-
// FIXME: may need to release resources allocated by acpi_bus_get_device()
18311820

18321821
/* Setup sensor configuration structure */
18331822
dev = kzalloc(sizeof(*dev), GFP_KERNEL);

drivers/staging/media/atomisp/i2c/atomisp-ov2680.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,17 +1244,6 @@ static int ov2680_probe(struct i2c_client *client)
12441244
int ret;
12451245
void *pdata;
12461246
unsigned int i;
1247-
acpi_handle handle;
1248-
struct acpi_device *adev;
1249-
1250-
handle = ACPI_HANDLE(&client->dev);
1251-
if (!handle || acpi_bus_get_device(handle, &adev)) {
1252-
dev_err(&client->dev, "Error could not get ACPI device\n");
1253-
return -ENODEV;
1254-
}
1255-
dev_info(&client->dev, "%s: ACPI detected it on bus ID=%s, HID=%s\n",
1256-
__func__, acpi_device_bid(adev), acpi_device_hid(adev));
1257-
// FIXME: may need to release resources allocated by acpi_bus_get_device()
12581247

12591248
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
12601249
if (!dev)

drivers/staging/media/atomisp/i2c/atomisp-ov2722.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,17 +1215,6 @@ static int ov2722_probe(struct i2c_client *client)
12151215
struct ov2722_device *dev;
12161216
void *ovpdev;
12171217
int ret;
1218-
acpi_handle handle;
1219-
struct acpi_device *adev;
1220-
1221-
handle = ACPI_HANDLE(&client->dev);
1222-
if (!handle || acpi_bus_get_device(handle, &adev)) {
1223-
dev_err(&client->dev, "Error could not get ACPI device\n");
1224-
return -ENODEV;
1225-
}
1226-
pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
1227-
__func__, acpi_device_bid(adev), acpi_device_hid(adev));
1228-
// FIXME: may need to release resources allocated by acpi_bus_get_device()
12291218

12301219
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
12311220
if (!dev)

drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1902,17 +1902,6 @@ static int ov5693_probe(struct i2c_client *client)
19021902
int ret = 0;
19031903
void *pdata;
19041904
unsigned int i;
1905-
acpi_handle handle;
1906-
struct acpi_device *adev;
1907-
1908-
handle = ACPI_HANDLE(&client->dev);
1909-
if (!handle || acpi_bus_get_device(handle, &adev)) {
1910-
dev_err(&client->dev, "Error could not get ACPI device\n");
1911-
return -ENODEV;
1912-
}
1913-
pr_info("%s: ACPI detected it on bus ID=%s, HID=%s\n",
1914-
__func__, acpi_device_bid(adev), acpi_device_hid(adev));
1915-
// FIXME: may need to release resources allocated by acpi_bus_get_device()
19161905

19171906
/*
19181907
* Firmware workaround: Some modules use a "secondary default"

0 commit comments

Comments
 (0)