Commit 4cc16085 authored by Jingoo Han's avatar Jingoo Han Committed by Mark Brown

spi: xcomm: Use devm_spi_register_master()

Use devm_spi_register_master() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6ce4eac1
...@@ -231,22 +231,13 @@ static int spi_xcomm_probe(struct i2c_client *i2c, ...@@ -231,22 +231,13 @@ static int spi_xcomm_probe(struct i2c_client *i2c,
master->dev.of_node = i2c->dev.of_node; master->dev.of_node = i2c->dev.of_node;
i2c_set_clientdata(i2c, master); i2c_set_clientdata(i2c, master);
ret = spi_register_master(master); ret = devm_spi_register_master(&i2c->dev, master);
if (ret < 0) if (ret < 0)
spi_master_put(master); spi_master_put(master);
return ret; return ret;
} }
static int spi_xcomm_remove(struct i2c_client *i2c)
{
struct spi_master *master = i2c_get_clientdata(i2c);
spi_unregister_master(master);
return 0;
}
static const struct i2c_device_id spi_xcomm_ids[] = { static const struct i2c_device_id spi_xcomm_ids[] = {
{ "spi-xcomm" }, { "spi-xcomm" },
{ }, { },
...@@ -259,7 +250,6 @@ static struct i2c_driver spi_xcomm_driver = { ...@@ -259,7 +250,6 @@ static struct i2c_driver spi_xcomm_driver = {
}, },
.id_table = spi_xcomm_ids, .id_table = spi_xcomm_ids,
.probe = spi_xcomm_probe, .probe = spi_xcomm_probe,
.remove = spi_xcomm_remove,
}; };
module_i2c_driver(spi_xcomm_driver); module_i2c_driver(spi_xcomm_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment