git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Code cleanup of the drivers source code
[pandora-kernel.git]
/
drivers
/
mfd
/
mcp-sa11x0.c
diff --git
a/drivers/mfd/mcp-sa11x0.c
b/drivers/mfd/mcp-sa11x0.c
index
720e7a3
..
1eab7cf
100644
(file)
--- a/
drivers/mfd/mcp-sa11x0.c
+++ b/
drivers/mfd/mcp-sa11x0.c
@@
-18,7
+18,7
@@
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <asm/dma.h>
#include <asm/hardware.h>
#include <asm/dma.h>
#include <asm/hardware.h>
@@
-138,9
+138,8
@@
static struct mcp_ops mcp_sa11x0 = {
.disable = mcp_sa11x0_disable,
};
.disable = mcp_sa11x0_disable,
};
-static int mcp_sa11x0_probe(struct
device *
dev)
+static int mcp_sa11x0_probe(struct
platform_device *p
dev)
{
{
- struct platform_device *pdev = to_platform_device(dev);
struct mcp_plat_data *data = pdev->dev.platform_data;
struct mcp *mcp;
int ret;
struct mcp_plat_data *data = pdev->dev.platform_data;
struct mcp *mcp;
int ret;
@@
-165,7
+164,7
@@
static int mcp_sa11x0_probe(struct device *dev)
mcp->dma_telco_rd = DMA_Ser4MCP1Rd;
mcp->dma_telco_wr = DMA_Ser4MCP1Wr;
mcp->dma_telco_rd = DMA_Ser4MCP1Rd;
mcp->dma_telco_wr = DMA_Ser4MCP1Wr;
-
dev_set_drvdata(
dev, mcp);
+
platform_set_drvdata(p
dev, mcp);
if (machine_is_assabet()) {
ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);
if (machine_is_assabet()) {
ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);
@@
-202,26
+201,26
@@
static int mcp_sa11x0_probe(struct device *dev)
release:
release_mem_region(0x80060000, 0x60);
release:
release_mem_region(0x80060000, 0x60);
-
dev_set_drvdata(
dev, NULL);
+
platform_set_drvdata(p
dev, NULL);
out:
return ret;
}
out:
return ret;
}
-static int mcp_sa11x0_remove(struct device *dev)
+static int mcp_sa11x0_remove(struct
platform_
device *dev)
{
{
- struct mcp *mcp =
dev
_get_drvdata(dev);
+ struct mcp *mcp =
platform
_get_drvdata(dev);
-
dev
_set_drvdata(dev, NULL);
+
platform
_set_drvdata(dev, NULL);
mcp_host_unregister(mcp);
release_mem_region(0x80060000, 0x60);
return 0;
}
mcp_host_unregister(mcp);
release_mem_region(0x80060000, 0x60);
return 0;
}
-static int mcp_sa11x0_suspend(struct device *dev, pm_message_t state)
+static int mcp_sa11x0_suspend(struct
platform_
device *dev, pm_message_t state)
{
{
- struct mcp *mcp =
dev
_get_drvdata(dev);
+ struct mcp *mcp =
platform
_get_drvdata(dev);
priv(mcp)->mccr0 = Ser4MCCR0;
priv(mcp)->mccr1 = Ser4MCCR1;
priv(mcp)->mccr0 = Ser4MCCR0;
priv(mcp)->mccr1 = Ser4MCCR1;
@@
-230,9
+229,9
@@
static int mcp_sa11x0_suspend(struct device *dev, pm_message_t state)
return 0;
}
return 0;
}
-static int mcp_sa11x0_resume(struct device *dev)
+static int mcp_sa11x0_resume(struct
platform_
device *dev)
{
{
- struct mcp *mcp =
dev
_get_drvdata(dev);
+ struct mcp *mcp =
platform
_get_drvdata(dev);
Ser4MCCR1 = priv(mcp)->mccr1;
Ser4MCCR0 = priv(mcp)->mccr0;
Ser4MCCR1 = priv(mcp)->mccr1;
Ser4MCCR0 = priv(mcp)->mccr0;
@@
-243,13
+242,14
@@
static int mcp_sa11x0_resume(struct device *dev)
/*
* The driver for the SA11x0 MCP port.
*/
/*
* The driver for the SA11x0 MCP port.
*/
-static struct device_driver mcp_sa11x0_driver = {
- .name = "sa11x0-mcp",
- .bus = &platform_bus_type,
+static struct platform_driver mcp_sa11x0_driver = {
.probe = mcp_sa11x0_probe,
.remove = mcp_sa11x0_remove,
.suspend = mcp_sa11x0_suspend,
.resume = mcp_sa11x0_resume,
.probe = mcp_sa11x0_probe,
.remove = mcp_sa11x0_remove,
.suspend = mcp_sa11x0_suspend,
.resume = mcp_sa11x0_resume,
+ .driver = {
+ .name = "sa11x0-mcp",
+ },
};
/*
};
/*
@@
-257,12
+257,12
@@
static struct device_driver mcp_sa11x0_driver = {
*/
static int __init mcp_sa11x0_init(void)
{
*/
static int __init mcp_sa11x0_init(void)
{
- return driver_register(&mcp_sa11x0_driver);
+ return
platform_
driver_register(&mcp_sa11x0_driver);
}
static void __exit mcp_sa11x0_exit(void)
{
}
static void __exit mcp_sa11x0_exit(void)
{
- driver_unregister(&mcp_sa11x0_driver);
+
platform_
driver_unregister(&mcp_sa11x0_driver);
}
module_init(mcp_sa11x0_init);
}
module_init(mcp_sa11x0_init);