openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

greybus: audio_codec: Don't be tricky with the driver model 

With the recent changes by Johan to the driver model of the greybus
code, the audio_codec no longer should need to provide a "dummy" driver
when registering the codec.  In fact, having it there causes the greybus
core to crash when inserting the module.  Removing it all fixes the
crash.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2016-01-20 14:41:40 -08:00
parent 7d81bafa4c
commit 4b87413428
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/greybus/audio_codec.c
View File

@ -571,13 +571,6 @@ static void gbaudio_free_codec(struct device *dev,
* This is the basic hook get things initialized and registered w/ gb
*/
/*
* GB codec module driver ops
*/
struct device_driver gb_codec_driver = {
.owner = THIS_MODULE,
};
/* XXX
* since BE DAI path is not yet properly closed from above layer,
* dsp dai.mi2s_dai_data.status_mask is still set to STATUS_PORT_STARTED
@ -625,7 +618,6 @@ static void gb_audio_cleanup(struct gbaudio_codec_info *gb)
static int gbaudio_codec_probe(struct gb_connection *connection)
{
int ret, i;
char *driver_name;
struct gbaudio_codec_info *gbcodec;
struct gb_audio_topology *topology;
struct gb_audio_manager_module_descriptor desc;
@ -669,13 +661,6 @@ static int gbaudio_codec_probe(struct gb_connection *connection)
for (i = 0; i < gbcodec->num_dais; i++)
gbcodec->dais[i].ops = &gbcodec_dai_ops;
/* FIXME */
driver_name = devm_kzalloc(dev, NAME_SIZE, GFP_KERNEL);
strlcpy(driver_name, gbcodec->name, NAME_SIZE);
gb_codec_driver.name = strsep(&driver_name, ".");
dev_dbg(dev, "driver.name:%s\n", gb_codec_driver.name);
dev->driver = &gb_codec_driver;
/* register codec */
ret = snd_soc_register_codec(dev, &soc_codec_dev_gbcodec,
gbcodec->dais, 1);