Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344650
b: refs/heads/master
c: ee6352d
h: refs/heads/master
v: v3
  • Loading branch information
Aaro Koskinen authored and Tomi Valkeinen committed Nov 22, 2012
1 parent 67eae80 commit f882cc4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 31 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 264236f82ea4ee5ee418f3e57c33d9d3fc37008f
refs/heads/master: ee6352de51c0ee151f1825b5f06f2e6e8ef44594
39 changes: 9 additions & 30 deletions trunk/drivers/video/omap2/displays/panel-n8x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -652,18 +652,25 @@ static struct omap_dss_driver n8x0_panel_driver = {

static int mipid_spi_probe(struct spi_device *spi)
{
int r;

dev_dbg(&spi->dev, "mipid_spi_probe\n");

spi->mode = SPI_MODE_0;

s_drv_data.spidev = spi;

return 0;
r = omap_dss_register_driver(&n8x0_panel_driver);
if (r)
pr_err("n8x0_panel: dss driver registration failed\n");

return r;
}

static int mipid_spi_remove(struct spi_device *spi)
{
dev_dbg(&spi->dev, "mipid_spi_remove\n");
omap_dss_unregister_driver(&n8x0_panel_driver);
return 0;
}

Expand All @@ -675,34 +682,6 @@ static struct spi_driver mipid_spi_driver = {
.probe = mipid_spi_probe,
.remove = __devexit_p(mipid_spi_remove),
};
module_spi_driver(mipid_spi_driver);

static int __init n8x0_panel_drv_init(void)
{
int r;

r = spi_register_driver(&mipid_spi_driver);
if (r) {
pr_err("n8x0_panel: spi driver registration failed\n");
return r;
}

r = omap_dss_register_driver(&n8x0_panel_driver);
if (r) {
pr_err("n8x0_panel: dss driver registration failed\n");
spi_unregister_driver(&mipid_spi_driver);
return r;
}

return 0;
}

static void __exit n8x0_panel_drv_exit(void)
{
spi_unregister_driver(&mipid_spi_driver);

omap_dss_unregister_driver(&n8x0_panel_driver);
}

module_init(n8x0_panel_drv_init);
module_exit(n8x0_panel_drv_exit);
MODULE_LICENSE("GPL");

0 comments on commit f882cc4

Please sign in to comment.