git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
irda
/
pxaficp_ir.c
diff --git
a/drivers/net/irda/pxaficp_ir.c
b/drivers/net/irda/pxaficp_ir.c
index
e1aa991
..
9137e23
100644
(file)
--- a/
drivers/net/irda/pxaficp_ir.c
+++ b/
drivers/net/irda/pxaficp_ir.c
@@
-12,7
+12,6
@@
* Infra-red driver (SIR/FIR) for the PXA2xx embedded microprocessor
*
*/
* Infra-red driver (SIR/FIR) for the PXA2xx embedded microprocessor
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/init.h>
@@
-200,7
+199,7
@@
static int pxa_irda_set_speed(struct pxa_irda *si, int speed)
}
/* SIR interrupt service routine. */
}
/* SIR interrupt service routine. */
-static irqreturn_t pxa_irda_sir_irq(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t pxa_irda_sir_irq(int irq, void *dev_id)
{
struct net_device *dev = dev_id;
struct pxa_irda *si = netdev_priv(dev);
{
struct net_device *dev = dev_id;
struct pxa_irda *si = netdev_priv(dev);
@@
-282,7
+281,7
@@
static irqreturn_t pxa_irda_sir_irq(int irq, void *dev_id, struct pt_regs *regs)
}
/* FIR Receive DMA interrupt handler */
}
/* FIR Receive DMA interrupt handler */
-static void pxa_irda_fir_dma_rx_irq(int channel, void *data
, struct pt_regs *regs
)
+static void pxa_irda_fir_dma_rx_irq(int channel, void *data)
{
int dcsr = DCSR(channel);
{
int dcsr = DCSR(channel);
@@
-292,7
+291,7
@@
static void pxa_irda_fir_dma_rx_irq(int channel, void *data, struct pt_regs *reg
}
/* FIR Transmit DMA interrupt handler */
}
/* FIR Transmit DMA interrupt handler */
-static void pxa_irda_fir_dma_tx_irq(int channel, void *data
, struct pt_regs *regs
)
+static void pxa_irda_fir_dma_tx_irq(int channel, void *data)
{
struct net_device *dev = data;
struct pxa_irda *si = netdev_priv(dev);
{
struct net_device *dev = data;
struct pxa_irda *si = netdev_priv(dev);
@@
-389,7
+388,7
@@
static void pxa_irda_fir_irq_eif(struct pxa_irda *si, struct net_device *dev)
}
/* FIR interrupt handler */
}
/* FIR interrupt handler */
-static irqreturn_t pxa_irda_fir_irq(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t pxa_irda_fir_irq(int irq, void *dev_id)
{
struct net_device *dev = dev_id;
struct pxa_irda *si = netdev_priv(dev);
{
struct net_device *dev = dev_id;
struct pxa_irda *si = netdev_priv(dev);
@@
-705,9
+704,9
@@
static int pxa_irda_stop(struct net_device *dev)
return 0;
}
return 0;
}
-static int pxa_irda_suspend(struct device *_dev, pm_message_t state)
+static int pxa_irda_suspend(struct
platform_
device *_dev, pm_message_t state)
{
{
- struct net_device *dev =
dev
_get_drvdata(_dev);
+ struct net_device *dev =
platform
_get_drvdata(_dev);
struct pxa_irda *si;
if (dev && netif_running(dev)) {
struct pxa_irda *si;
if (dev && netif_running(dev)) {
@@
-719,9
+718,9
@@
static int pxa_irda_suspend(struct device *_dev, pm_message_t state)
return 0;
}
return 0;
}
-static int pxa_irda_resume(struct device *_dev)
+static int pxa_irda_resume(struct
platform_
device *_dev)
{
{
- struct net_device *dev =
dev
_get_drvdata(_dev);
+ struct net_device *dev =
platform
_get_drvdata(_dev);
struct pxa_irda *si;
if (dev && netif_running(dev)) {
struct pxa_irda *si;
if (dev && netif_running(dev)) {
@@
-747,9
+746,8
@@
static int pxa_irda_init_iobuf(iobuff_t *io, int size)
return io->head ? 0 : -ENOMEM;
}
return io->head ? 0 : -ENOMEM;
}
-static int pxa_irda_probe(struct
device *_
dev)
+static int pxa_irda_probe(struct
platform_device *p
dev)
{
{
- struct platform_device *pdev = to_platform_device(_dev);
struct net_device *dev;
struct pxa_irda *si;
unsigned int baudrate_mask;
struct net_device *dev;
struct pxa_irda *si;
unsigned int baudrate_mask;
@@
-823,9
+821,9
@@
err_mem_1:
return err;
}
return err;
}
-static int pxa_irda_remove(struct device *_dev)
+static int pxa_irda_remove(struct
platform_
device *_dev)
{
{
- struct net_device *dev =
dev
_get_drvdata(_dev);
+ struct net_device *dev =
platform
_get_drvdata(_dev);
if (dev) {
struct pxa_irda *si = netdev_priv(dev);
if (dev) {
struct pxa_irda *si = netdev_priv(dev);
@@
-841,9
+839,10
@@
static int pxa_irda_remove(struct device *_dev)
return 0;
}
return 0;
}
-static struct device_driver pxa_ir_driver = {
- .name = "pxa2xx-ir",
- .bus = &platform_bus_type,
+static struct platform_driver pxa_ir_driver = {
+ .driver = {
+ .name = "pxa2xx-ir",
+ },
.probe = pxa_irda_probe,
.remove = pxa_irda_remove,
.suspend = pxa_irda_suspend,
.probe = pxa_irda_probe,
.remove = pxa_irda_remove,
.suspend = pxa_irda_suspend,
@@
-852,12
+851,12
@@
static struct device_driver pxa_ir_driver = {
static int __init pxa_irda_init(void)
{
static int __init pxa_irda_init(void)
{
- return driver_register(&pxa_ir_driver);
+ return
platform_
driver_register(&pxa_ir_driver);
}
static void __exit pxa_irda_exit(void)
{
}
static void __exit pxa_irda_exit(void)
{
- driver_unregister(&pxa_ir_driver);
+
platform_
driver_unregister(&pxa_ir_driver);
}
module_init(pxa_irda_init);
}
module_init(pxa_irda_init);