From b2e0a8222542f12d7f67bee989647a9760d4def4 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Fri, 14 Sep 2018 21:21:47 -0500
Subject: [PATCH] device: Remove Scan method

---
 src/device.c  | 19 -------------------
 src/station.c |  2 +-
 src/station.h |  3 ---
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/device.c b/src/device.c
index 7cab2c13..5f17b3c6 100644
--- a/src/device.c
+++ b/src/device.c
@@ -72,23 +72,6 @@ static void device_ap_roam_frame_event(struct netdev *netdev,
 	station_ap_directed_roam(station, hdr, body, body_len);
 }
 
-static struct l_dbus_message *device_scan(struct l_dbus *dbus,
-						struct l_dbus_message *message,
-						void *user_data)
-{
-	struct device *device = user_data;
-	struct station *station = device->station;
-
-	/* TODO: Remove when Device/Station split is done */
-	if (netdev_get_iftype(device->netdev) != NETDEV_IFTYPE_STATION)
-		return dbus_error_not_available(message);
-
-	if (!device->powered)
-		return dbus_error_failed(message);
-
-	return station_dbus_scan(dbus, message, station);
-}
-
 static struct l_dbus_message *device_get_networks(struct l_dbus *dbus,
 						struct l_dbus_message *message,
 						void *user_data)
@@ -436,8 +419,6 @@ static struct l_dbus_message *device_property_set_mode(struct l_dbus *dbus,
 
 static void setup_device_interface(struct l_dbus_interface *interface)
 {
-	l_dbus_interface_method(interface, "Scan", 0,
-				device_scan, "", "");
 	l_dbus_interface_method(interface, "GetOrderedNetworks", 0,
 				device_get_networks, "a(osns)", "",
 				"networks");
diff --git a/src/station.c b/src/station.c
index 07344e9a..46d76e90 100644
--- a/src/station.c
+++ b/src/station.c
@@ -1931,7 +1931,7 @@ static void station_dbus_scan_triggered(int err, void *user_data)
 				IWD_DEVICE_INTERFACE, "Scanning");
 }
 
-struct l_dbus_message *station_dbus_scan(struct l_dbus *dbus,
+static struct l_dbus_message *station_dbus_scan(struct l_dbus *dbus,
 						struct l_dbus_message *message,
 						void *user_data)
 {
diff --git a/src/station.h b/src/station.h
index 6fc3a9ba..42ce6a0a 100644
--- a/src/station.h
+++ b/src/station.h
@@ -103,9 +103,6 @@ struct l_dbus_message *station_build_get_networks_reply(
 						struct station *station,
 						struct l_dbus_message *message,
 						bool legacy);
-struct l_dbus_message *station_dbus_scan(struct l_dbus *dbus,
-						struct l_dbus_message *message,
-						void *user_data);
 
 int __station_connect_network(struct station *station, struct network *network,
 				struct scan_bss *bss);