summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/device.c6
-rw-r--r--src/driver.h6
2 files changed, 5 insertions, 7 deletions
diff --git a/src/device.c b/src/device.c
index ac578f2b..b22695e1 100644
--- a/src/device.c
+++ b/src/device.c
@@ -574,7 +574,7 @@ void device_remove(DBusConnection *conn, struct btd_device *device)
struct btd_driver_data *driver_data = list->data;
driver = driver_data->driver;
- driver->remove(driver, device);
+ driver->remove(device);
g_free(driver_data);
}
@@ -645,7 +645,7 @@ void device_probe_drivers(struct btd_device *device, GSList *uuids, sdp_list_t *
if (records) {
struct btd_driver_data *driver_data = g_new0(struct btd_driver_data, 1);
- err = driver->probe(driver, device, records);
+ err = driver->probe(device, records);
if (err < 0) {
error("probe failed for driver %s",
driver->name);
@@ -686,7 +686,7 @@ void device_remove_drivers(struct btd_device *device, GSList *uuids, sdp_list_t
(GCompareFunc) strcasecmp))
continue;
- driver->remove(driver, device);
+ driver->remove(device);
device->drivers = g_slist_remove(device->drivers,
driver_data);
diff --git a/src/driver.h b/src/driver.h
index a69ebab1..e27c7de5 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -29,10 +29,8 @@ struct btd_device;
struct btd_device_driver {
const char *name;
const char **uuids;
- int (*probe) (struct btd_device_driver *driver,
- struct btd_device *device, GSList *records);
- void (*remove) (struct btd_device_driver *driver,
- struct btd_device *device);
+ int (*probe) (struct btd_device *device, GSList *records);
+ void (*remove) (struct btd_device *device);
};
int btd_register_device_driver(struct btd_device_driver *driver);