Skip to content

Soundwire: register intel sdw master driver with driver_register() #1607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 1 commit into from
Dec 11, 2019
Merged

Soundwire: register intel sdw master driver with driver_register() #1607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions drivers/soundwire/intel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <linux/soundwire/sdw_registers.h>
#include <linux/soundwire/sdw.h>
#include <linux/soundwire/sdw_intel.h>
#include <linux/soundwire/sdw_type.h>
#include "cadence_master.h"
#include "bus.h"
#include "intel.h"
Expand Down Expand Up @@ -1654,6 +1655,7 @@ struct sdw_md_driver intel_sdw_driver = {
.name = "intel-sdw",
.owner = THIS_MODULE,
.pm = &intel_pm,
.bus = &sdw_bus_type,
},
.probe = intel_master_probe,
.startup = intel_master_startup,
Expand Down
10 changes: 10 additions & 0 deletions drivers/soundwire/intel_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ static struct sdw_intel_ctx
struct sdw_master_device *md;
u32 link_mask;
int count;
int err;
int i;

if (!res)
Expand Down Expand Up @@ -218,6 +219,12 @@ static struct sdw_intel_ctx

INIT_LIST_HEAD(&ctx->link_list);

err = driver_register(&intel_sdw_driver.driver);
if (err) {
dev_err(&adev->dev, "failed to register sdw master driver\n");
goto register_err;
}

/* Create SDW Master devices */
for (i = 0; i < count; i++, link++) {
if (link_mask && !(link_mask & BIT(i)))
Expand Down Expand Up @@ -252,6 +259,8 @@ static struct sdw_intel_ctx
err:
sdw_intel_cleanup(ctx);
link_err:
driver_unregister(&intel_sdw_driver.driver);
register_err:
kfree(ctx);
return NULL;
}
Expand Down Expand Up @@ -395,6 +404,7 @@ EXPORT_SYMBOL(sdw_intel_startup);
void sdw_intel_exit(struct sdw_intel_ctx *ctx)
{
sdw_intel_cleanup(ctx);
driver_unregister(&intel_sdw_driver.driver);
kfree(ctx);
}
EXPORT_SYMBOL(sdw_intel_exit);
Expand Down
3 changes: 1 addition & 2 deletions drivers/soundwire/master.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ struct sdw_master_device *sdw_md_add(struct sdw_md_driver *driver,
md->dev.type = &sdw_md_type;
md->dev.dma_mask = md->dev.parent->dma_mask;
dev_set_name(&md->dev, "sdw-master-%d", md->link_id);
md->dev.driver = &driver->driver;

ret = device_register(&md->dev);
if (ret) {
Expand All @@ -57,8 +58,6 @@ struct sdw_master_device *sdw_md_add(struct sdw_md_driver *driver,
put_device(&md->dev);
}

md->dev.driver = &driver->driver;

return md;
}
EXPORT_SYMBOL(sdw_md_add);