From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ 3/5] adapter: Remove never used parameter
Date: Tue, 18 Jun 2013 17:13:45 -0300 [thread overview]
Message-ID: <1371586427-7909-3-git-send-email-lucas.demarchi@profusion.mobi> (raw)
In-Reply-To: <1371586427-7909-1-git-send-email-lucas.demarchi@profusion.mobi>
From: Lucas De Marchi <lucas.demarchi@intel.com>
adapter_remove_device() is always called with remove_storage set to
TRUE, so remove it.
---
src/adapter.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 9e817f2..17f5508 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1019,8 +1019,7 @@ static void service_auth_cancel(struct service_auth *auth)
}
static void adapter_remove_device(struct btd_adapter *adapter,
- struct btd_device *dev,
- gboolean remove_storage)
+ struct btd_device *dev)
{
GList *l;
@@ -1052,7 +1051,7 @@ static void adapter_remove_device(struct btd_adapter *adapter,
service_auth_cancel(auth);
}
- device_remove(dev, remove_storage);
+ device_remove(dev, TRUE);
}
struct btd_device *adapter_get_device(struct btd_adapter *adapter,
@@ -1514,7 +1513,7 @@ static gboolean remove_temp_devices(gpointer user_data)
next = g_slist_next(l);
if (device_is_temporary(dev))
- adapter_remove_device(adapter, dev, TRUE);
+ adapter_remove_device(adapter, dev);
}
return FALSE;
@@ -2141,7 +2140,7 @@ static DBusMessage *remove_device(DBusConnection *conn,
device_set_temporary(device, TRUE);
if (!device_is_connected(device)) {
- adapter_remove_device(adapter, device, TRUE);
+ adapter_remove_device(adapter, device);
return dbus_message_new_method_return(msg);
}
@@ -4252,7 +4251,7 @@ static void adapter_remove_connection(struct btd_adapter *adapter,
const char *path = device_get_path(device);
DBG("Removing temporary device %s", path);
- adapter_remove_device(adapter, device, TRUE);
+ adapter_remove_device(adapter, device);
}
}
@@ -5808,7 +5807,7 @@ static void connect_failed_callback(uint16_t index, uint16_t length,
* when it is temporary. */
if (device && !device_is_bonding(device, NULL)
&& device_is_temporary(device))
- adapter_remove_device(adapter, device, TRUE);
+ adapter_remove_device(adapter, device);
}
static void unpaired_callback(uint16_t index, uint16_t length,
@@ -5839,7 +5838,7 @@ static void unpaired_callback(uint16_t index, uint16_t length,
if (device_is_connected(device))
device_request_disconnect(device, NULL);
else
- adapter_remove_device(adapter, device, TRUE);
+ adapter_remove_device(adapter, device);
}
static void read_info_complete(uint8_t status, uint16_t length,
--
1.8.3.1
next prev parent reply other threads:[~2013-06-18 20:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 20:13 [PATCH BlueZ 1/5] build-sys: Don't build gdbus several times Lucas De Marchi
2013-06-18 20:13 ` [PATCH BlueZ 2/5] gitignore: Add missing tools Lucas De Marchi
2013-06-18 20:13 ` Lucas De Marchi [this message]
2013-06-18 20:13 ` [PATCH BlueZ 4/5] client: Display command even with no description Lucas De Marchi
2013-06-19 5:08 ` Marcel Holtmann
2013-06-19 9:08 ` Johan Hedberg
2013-06-19 10:31 ` Marcel Holtmann
2013-06-19 13:40 ` Lucas De Marchi
2013-06-19 14:54 ` Marcel Holtmann
2013-06-19 15:02 ` Lucas De Marchi
2013-06-18 20:13 ` [PATCH BlueZ 5/5] client: prettify help table Lucas De Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371586427-7909-3-git-send-email-lucas.demarchi@profusion.mobi \
--to=lucas.demarchi@profusion.mobi \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).