mirror of
https://git.kernel.org/pub/scm/bluetooth/bluez.git
synced 2025-01-19 19:03:47 +08:00
Convert two more users to g_timeout_add_seconds()
This commit is contained in:
parent
972fc8cc71
commit
321b4afa54
@ -799,7 +799,8 @@ static void close_cfm(struct avdtp *session, struct avdtp_local_sep *sep,
|
||||
}
|
||||
|
||||
if (setup->reconfigure)
|
||||
g_timeout_add(RECONFIGURE_TIMEOUT, a2dp_reconfigure, setup);
|
||||
g_timeout_add_seconds(RECONFIGURE_TIMEOUT,
|
||||
a2dp_reconfigure, setup);
|
||||
}
|
||||
|
||||
static gboolean abort_ind(struct avdtp *session, struct avdtp_local_sep *sep,
|
||||
|
@ -249,8 +249,9 @@ static void open_notify(int fd, int err, struct serial_port *port)
|
||||
g_dbus_send_message(device->conn, reply);
|
||||
}
|
||||
|
||||
static gboolean open_continue(struct serial_port *port)
|
||||
static gboolean open_continue(gpointer user_data)
|
||||
{
|
||||
struct serial_port *port = user_data;
|
||||
int fd;
|
||||
static int ntries = MAX_OPEN_TRIES;
|
||||
|
||||
@ -282,7 +283,7 @@ static int port_open(struct serial_port *port)
|
||||
|
||||
fd = open(port->dev, O_RDONLY | O_NOCTTY);
|
||||
if (fd < 0) {
|
||||
g_timeout_add(OPEN_WAIT, (GSourceFunc) open_continue, port);
|
||||
g_timeout_add_seconds(OPEN_WAIT, open_continue, port);
|
||||
return -EINPROGRESS;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user