From a547deb5105b583138e74e882b1e2aae1f76dc9c Mon Sep 17 00:00:00 2001 From: Vaibhav Agarwal Date: Thu, 21 Jan 2016 22:33:13 +0530 Subject: [PATCH] greybus: audio_codec: update codec_name as per driver->name Originally, driver->name was not poluated from GB and thus manually set from audio_codec driver as a hack. This is no more required. Another patch already removes that hack. Now, with new driver->name as "legacy." codec is registered with different name. So, during DAI link registration as well it needs modification. Signed-off-by: Vaibhav Agarwal Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/audio_codec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c index 5c02b6534ab2..1f39c9cd1aee 100644 --- a/drivers/staging/greybus/audio_codec.c +++ b/drivers/staging/greybus/audio_codec.c @@ -541,7 +541,8 @@ static struct gbaudio_codec_info *gbaudio_get_codec(struct device *dev, gbcodec->dev_id = dev_id; dev_set_drvdata(dev, gbcodec); gbcodec->dev = dev; - strlcpy(gbcodec->name, dev_name(dev), NAME_SIZE); + snprintf(gbcodec->name, NAME_SIZE, "%s.%s", dev->driver->name, + dev_name(dev)); mutex_lock(&gb_codec_list_lock); list_add(&gbcodec->list, &gb_codec_list); -- 2.20.1