From 21b0084397d0a1468839932e61ccb0d0c61f6e71 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Wed, 5 Dec 2012 11:10:24 +0100 Subject: [PATCH] audio: Remove src and dst from struct audio_device Those are not used anymore as addresses are takes from btd_device reference. --- profiles/audio/device.c | 6 +----- profiles/audio/device.h | 7 +------ profiles/audio/manager.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/profiles/audio/device.c b/profiles/audio/device.c index a0ace5efb..0d66d9a61 100644 --- a/profiles/audio/device.c +++ b/profiles/audio/device.c @@ -292,9 +292,7 @@ static void device_avctp_cb(struct audio_device *dev, } } -struct audio_device *audio_device_register(struct btd_device *device, - const bdaddr_t *src, - const bdaddr_t *dst) +struct audio_device *audio_device_register(struct btd_device *device) { struct audio_device *dev; @@ -303,8 +301,6 @@ struct audio_device *audio_device_register(struct btd_device *device, dev = g_new0(struct audio_device, 1); dev->btd_dev = btd_device_ref(device); - bacpy(&dev->dst, dst); - bacpy(&dev->src, src); dev->priv = g_new0(struct dev_priv, 1); dev->priv->state = AUDIO_STATE_DISCONNECTED; diff --git a/profiles/audio/device.h b/profiles/audio/device.h index 77e3c986e..325214ba6 100644 --- a/profiles/audio/device.h +++ b/profiles/audio/device.h @@ -36,9 +36,6 @@ typedef void (*audio_device_cb) (struct audio_device *dev, int err, void *data); struct audio_device { struct btd_device *btd_dev; - bdaddr_t src; - bdaddr_t dst; - struct sink *sink; struct source *source; struct control *control; @@ -50,9 +47,7 @@ struct audio_device { struct dev_priv *priv; }; -struct audio_device *audio_device_register(struct btd_device *device, - const bdaddr_t *src, - const bdaddr_t *dst); +struct audio_device *audio_device_register(struct btd_device *device); void audio_device_unregister(struct audio_device *device); diff --git a/profiles/audio/manager.c b/profiles/audio/manager.c index 1f55df96f..349894556 100644 --- a/profiles/audio/manager.c +++ b/profiles/audio/manager.c @@ -741,7 +741,7 @@ struct audio_device *manager_get_device(const bdaddr_t *src, return NULL; } - dev = audio_device_register(device, src, dst); + dev = audio_device_register(device); if (!dev) return NULL; -- 2.47.3