projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/
[powerpc.git]
/
drivers
/
i2c
/
chips
/
isp1301_omap.c
diff --git
a/drivers/i2c/chips/isp1301_omap.c
b/drivers/i2c/chips/isp1301_omap.c
index
354a262
..
d2a100d
100644
(file)
--- a/
drivers/i2c/chips/isp1301_omap.c
+++ b/
drivers/i2c/chips/isp1301_omap.c
@@
-27,7
+27,7
@@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <linux/usb_ch9.h>
#include <linux/usb_gadget.h>
#include <linux/usb.h>
#include <linux/usb_ch9.h>
#include <linux/usb_gadget.h>
#include <linux/usb.h>
@@
-873,25
+873,27
@@
static int otg_init(struct isp1301 *isp)
return 0;
}
return 0;
}
-static int otg_probe(struct device *dev)
+static int otg_probe(struct
platform_
device *dev)
{
// struct omap_usb_config *config = dev->platform_data;
{
// struct omap_usb_config *config = dev->platform_data;
- otg_dev =
to_platform_device(dev)
;
+ otg_dev =
dev
;
return 0;
}
return 0;
}
-static int otg_remove(struct device *dev)
+static int otg_remove(struct
platform_
device *dev)
{
otg_dev = 0;
return 0;
}
{
otg_dev = 0;
return 0;
}
-struct device_driver omap_otg_driver = {
- .name = "omap_otg",
- .bus = &platform_bus_type,
+struct platform_driver omap_otg_driver = {
.probe = otg_probe,
.probe = otg_probe,
- .remove = otg_remove,
+ .remove = otg_remove,
+ .driver = {
+ .owner = THIS_MODULE,
+ .name = "omap_otg",
+ },
};
static int otg_bind(struct isp1301 *isp)
};
static int otg_bind(struct isp1301 *isp)
@@
-901,7
+903,7
@@
static int otg_bind(struct isp1301 *isp)
if (otg_dev)
return -EBUSY;
if (otg_dev)
return -EBUSY;
- status = driver_register(&omap_otg_driver);
+ status =
platform_
driver_register(&omap_otg_driver);
if (status < 0)
return status;
if (status < 0)
return status;
@@
-912,7
+914,7
@@
static int otg_bind(struct isp1301 *isp)
status = -ENODEV;
if (status < 0)
status = -ENODEV;
if (status < 0)
- driver_unregister(&omap_otg_driver);
+
platform_
driver_unregister(&omap_otg_driver);
return status;
}
return status;
}
@@
-1489,7
+1491,7
@@
static int isp1301_probe(struct i2c_adapter *bus, int address, int kind)
if (the_transceiver)
return 0;
if (the_transceiver)
return 0;
- isp = k
calloc(1,
sizeof *isp, GFP_KERNEL);
+ isp = k
zalloc(
sizeof *isp, GFP_KERNEL);
if (!isp)
return 0;
if (!isp)
return 0;