summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2011-08-24 10:00:21 +0300
committerSamuel Ortiz <sameo@linux.intel.com>2011-08-24 15:36:35 +0200
commitfcfc5cc4268e7458a64b22d31537473327fed6a8 (patch)
treec6a652e234731ad5f705a58fd55759e925aff3bc
parentee4cbc035710adb219b77f27577b73df5cb1a060 (diff)
downloadconnman-fcfc5cc4268e7458a64b22d31537473327fed6a8.tar.gz
connman-fcfc5cc4268e7458a64b22d31537473327fed6a8.tar.bz2
connman-fcfc5cc4268e7458a64b22d31537473327fed6a8.zip
device: Device scan function made private
The __connman_device_scan() is now static as it is only called from device.c
-rw-r--r--src/connman.h1
-rw-r--r--src/device.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/src/connman.h b/src/connman.h
index d74e653c..945d8e88 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -361,7 +361,6 @@ void __connman_device_set_network(struct connman_device *device,
struct connman_network *network);
void __connman_device_cleanup_networks(struct connman_device *device);
-int __connman_device_scan(struct connman_device *device);
int __connman_device_enable(struct connman_device *device);
int __connman_device_enable_persistent(struct connman_device *device);
int __connman_device_disable(struct connman_device *device);
diff --git a/src/device.c b/src/device.c
index 3fb4b1ed..12fa49a0 100644
--- a/src/device.c
+++ b/src/device.c
@@ -725,7 +725,7 @@ connman_bool_t __connman_device_get_blocked(struct connman_device *device)
return device->blocked;
}
-int __connman_device_scan(struct connman_device *device)
+static int device_scan(struct connman_device *device)
{
if (!device->driver || !device->driver->scan)
return -EOPNOTSUPP;
@@ -1310,7 +1310,7 @@ int __connman_device_request_scan(enum connman_service_type type)
continue;
}
- err = __connman_device_scan(device);
+ err = device_scan(device);
if (err < 0 && err != -EINPROGRESS) {
DBG("err %d", err);
/* XXX maybe only a continue? */