diff options
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/au1k_ir.c | 8 | ||||
| -rw-r--r-- | drivers/net/irda/bfin_sir.c | 8 | ||||
| -rw-r--r-- | drivers/net/irda/ep7211-sir.c | 73 | ||||
| -rw-r--r-- | drivers/net/irda/sh_irda.c | 10 | ||||
| -rw-r--r-- | drivers/net/irda/sh_sir.c | 6 | ||||
| -rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 6 | ||||
| -rw-r--r-- | drivers/net/irda/via-ircc.c | 15 | ||||
| -rw-r--r-- | drivers/net/irda/vlsi_ir.c | 6 |
8 files changed, 54 insertions, 78 deletions
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c index e09417df8f39..b5151e4ced61 100644 --- a/drivers/net/irda/au1k_ir.c +++ b/drivers/net/irda/au1k_ir.c @@ -760,7 +760,7 @@ static const struct net_device_ops au1k_irda_netdev_ops = { .ndo_do_ioctl = au1k_irda_ioctl, }; -static int __devinit au1k_irda_net_init(struct net_device *dev) +static int au1k_irda_net_init(struct net_device *dev) { struct au1k_private *aup = netdev_priv(dev); struct db_dest *pDB, *pDBfree; @@ -849,7 +849,7 @@ out1: return retval; } -static int __devinit au1k_irda_probe(struct platform_device *pdev) +static int au1k_irda_probe(struct platform_device *pdev) { struct au1k_private *aup; struct net_device *dev; @@ -921,7 +921,7 @@ out: return err; } -static int __devexit au1k_irda_remove(struct platform_device *pdev) +static int au1k_irda_remove(struct platform_device *pdev) { struct net_device *dev = platform_get_drvdata(pdev); struct au1k_private *aup = netdev_priv(dev); @@ -949,7 +949,7 @@ static struct platform_driver au1k_irda_driver = { .owner = THIS_MODULE, }, .probe = au1k_irda_probe, - .remove = __devexit_p(au1k_irda_remove), + .remove = au1k_irda_remove, }; static int __init au1k_irda_load(void) diff --git a/drivers/net/irda/bfin_sir.c b/drivers/net/irda/bfin_sir.c index c6a0299aa9f9..fed4a05d55c7 100644 --- a/drivers/net/irda/bfin_sir.c +++ b/drivers/net/irda/bfin_sir.c @@ -31,7 +31,7 @@ static void turnaround_delay(unsigned long last_jif, int mtt) schedule_timeout_uninterruptible(ticks); } -static void __devinit bfin_sir_init_ports(struct bfin_sir_port *sp, struct platform_device *pdev) +static void bfin_sir_init_ports(struct bfin_sir_port *sp, struct platform_device *pdev) { int i; struct resource *res; @@ -688,7 +688,7 @@ static const struct net_device_ops bfin_sir_ndo = { .ndo_get_stats = bfin_sir_stats, }; -static int __devinit bfin_sir_probe(struct platform_device *pdev) +static int bfin_sir_probe(struct platform_device *pdev) { struct net_device *dev; struct bfin_sir_self *self; @@ -775,7 +775,7 @@ err_mem_0: return err; } -static int __devexit bfin_sir_remove(struct platform_device *pdev) +static int bfin_sir_remove(struct platform_device *pdev) { struct bfin_sir_port *sir_port; struct net_device *dev = NULL; @@ -798,7 +798,7 @@ static int __devexit bfin_sir_remove(struct platform_device *pdev) static struct platform_driver bfin_ir_driver = { .probe = bfin_sir_probe, - .remove = __devexit_p(bfin_sir_remove), + .remove = bfin_sir_remove, .suspend = bfin_sir_suspend, .resume = bfin_sir_resume, .driver = { diff --git a/drivers/net/irda/ep7211-sir.c b/drivers/net/irda/ep7211-sir.c index f83c5b881d2d..5fe1f4dd3369 100644 --- a/drivers/net/irda/ep7211-sir.c +++ b/drivers/net/irda/ep7211-sir.c @@ -1,52 +1,18 @@ /* - * IR port driver for the Cirrus Logic EP7211 processor. + * IR port driver for the Cirrus Logic CLPS711X processors * * Copyright 2001, Blue Mug Inc. All rights reserved. * Copyright 2007, Samuel Ortiz <samuel@sortiz.org> */ -#include <linux/module.h> -#include <linux/delay.h> -#include <linux/tty.h> -#include <linux/init.h> -#include <linux/spinlock.h> -#include <net/irda/irda.h> -#include <net/irda/irda_device.h> +#include <linux/module.h> +#include <linux/platform_device.h> -#include <asm/io.h> #include <mach/hardware.h> #include "sir-dev.h" -#define MIN_DELAY 25 /* 15 us, but wait a little more to be sure */ -#define MAX_DELAY 10000 /* 1 ms */ - -static int ep7211_open(struct sir_dev *dev); -static int ep7211_close(struct sir_dev *dev); -static int ep7211_change_speed(struct sir_dev *dev, unsigned speed); -static int ep7211_reset(struct sir_dev *dev); - -static struct dongle_driver ep7211 = { - .owner = THIS_MODULE, - .driver_name = "EP7211 IR driver", - .type = IRDA_EP7211_DONGLE, - .open = ep7211_open, - .close = ep7211_close, - .reset = ep7211_reset, - .set_speed = ep7211_change_speed, -}; - -static int __init ep7211_sir_init(void) -{ - return irda_register_dongle(&ep7211); -} - -static void __exit ep7211_sir_cleanup(void) -{ - irda_unregister_dongle(&ep7211); -} - -static int ep7211_open(struct sir_dev *dev) +static int clps711x_dongle_open(struct sir_dev *dev) { unsigned int syscon; @@ -58,7 +24,7 @@ static int ep7211_open(struct sir_dev *dev) return 0; } -static int ep7211_close(struct sir_dev *dev) +static int clps711x_dongle_close(struct sir_dev *dev) { unsigned int syscon; @@ -70,20 +36,35 @@ static int ep7211_close(struct sir_dev *dev) return 0; } -static int ep7211_change_speed(struct sir_dev *dev, unsigned speed) +static struct dongle_driver clps711x_dongle = { + .owner = THIS_MODULE, + .driver_name = "EP7211 IR driver", + .type = IRDA_EP7211_DONGLE, + .open = clps711x_dongle_open, + .close = clps711x_dongle_close, +}; + +static int clps711x_sir_probe(struct platform_device *pdev) { - return 0; + return irda_register_dongle(&clps711x_dongle); } -static int ep7211_reset(struct sir_dev *dev) +static int clps711x_sir_remove(struct platform_device *pdev) { - return 0; + return irda_unregister_dongle(&clps711x_dongle); } +static struct platform_driver clps711x_sir_driver = { + .driver = { + .name = "sir-clps711x", + .owner = THIS_MODULE, + }, + .probe = clps711x_sir_probe, + .remove = clps711x_sir_remove, +}; +module_platform_driver(clps711x_sir_driver); + MODULE_AUTHOR("Samuel Ortiz <samuel@sortiz.org>"); MODULE_DESCRIPTION("EP7211 IR dongle driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("irda-dongle-13"); /* IRDA_EP7211_DONGLE */ - -module_init(ep7211_sir_init); -module_exit(ep7211_sir_cleanup); diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c index 4b746d9bd8e7..9448587de453 100644 --- a/drivers/net/irda/sh_irda.c +++ b/drivers/net/irda/sh_irda.c @@ -33,11 +33,7 @@ #define DRIVER_NAME "sh_irda" -#if defined(CONFIG_ARCH_SH7367) || defined(CONFIG_ARCH_SH7377) -#define __IRDARAM_LEN 0x13FF -#else #define __IRDARAM_LEN 0x1039 -#endif #define IRTMR 0x1F00 /* Transfer mode */ #define IRCFR 0x1F02 /* Configuration */ @@ -757,7 +753,7 @@ static const struct net_device_ops sh_irda_ndo = { ************************************************************************/ -static int __devinit sh_irda_probe(struct platform_device *pdev) +static int sh_irda_probe(struct platform_device *pdev) { struct net_device *ndev; struct sh_irda_self *self; @@ -829,7 +825,7 @@ exit: return err; } -static int __devexit sh_irda_remove(struct platform_device *pdev) +static int sh_irda_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); struct sh_irda_self *self = netdev_priv(ndev); @@ -866,7 +862,7 @@ static const struct dev_pm_ops sh_irda_pm_ops = { static struct platform_driver sh_irda_driver = { .probe = sh_irda_probe, - .remove = __devexit_p(sh_irda_remove), + .remove = sh_irda_remove, .driver = { .name = DRIVER_NAME, .pm = &sh_irda_pm_ops, diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c index 624ac1939e85..24aefcd84065 100644 --- a/drivers/net/irda/sh_sir.c +++ b/drivers/net/irda/sh_sir.c @@ -705,7 +705,7 @@ static const struct net_device_ops sh_sir_ndo = { ************************************************************************/ -static int __devinit sh_sir_probe(struct platform_device *pdev) +static int sh_sir_probe(struct platform_device *pdev) { struct net_device *ndev; struct sh_sir_self *self; @@ -783,7 +783,7 @@ exit: return err; } -static int __devexit sh_sir_remove(struct platform_device *pdev) +static int sh_sir_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); struct sh_sir_self *self = netdev_priv(ndev); @@ -803,7 +803,7 @@ static int __devexit sh_sir_remove(struct platform_device *pdev) static struct platform_driver sh_sir_driver = { .probe = sh_sir_probe, - .remove = __devexit_p(sh_sir_remove), + .remove = sh_sir_remove, .driver = { .name = DRIVER_NAME, }, diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index a926813ee91d..5290952b60c2 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c @@ -376,8 +376,8 @@ MODULE_DEVICE_TABLE(pnp, smsc_ircc_pnp_table); static int pnp_driver_registered; #ifdef CONFIG_PNP -static int __devinit smsc_ircc_pnp_probe(struct pnp_dev *dev, - const struct pnp_device_id *dev_id) +static int smsc_ircc_pnp_probe(struct pnp_dev *dev, + const struct pnp_device_id *dev_id) { unsigned int firbase, sirbase; u8 dma, irq; @@ -515,7 +515,7 @@ static const struct net_device_ops smsc_ircc_netdev_ops = { * Try to open driver instance * */ -static int __devinit smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u8 dma, u8 irq) +static int smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u8 dma, u8 irq) { struct smsc_ircc_cb *self; struct net_device *dev; diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 1a89fd459dd5..f9033c6a888c 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c @@ -77,7 +77,7 @@ static int dongle_id = 0; /* default: probe */ module_param(dongle_id, int, 0); /* Some prototypes */ -static int via_ircc_open(struct pci_dev *pdev, chipio_t * info, +static int via_ircc_open(struct pci_dev *pdev, chipio_t *info, unsigned int id); static int via_ircc_dma_receive(struct via_ircc_cb *self); static int via_ircc_dma_receive_complete(struct via_ircc_cb *self, @@ -102,8 +102,8 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase); static void hwreset(struct via_ircc_cb *self); static int via_ircc_dma_xmit(struct via_ircc_cb *self, u16 iobase); static int upload_rxdata(struct via_ircc_cb *self, int iobase); -static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_device_id *id); -static void __devexit via_remove_one (struct pci_dev *pdev); +static int via_init_one(struct pci_dev *pcidev, const struct pci_device_id *id); +static void via_remove_one(struct pci_dev *pdev); /* FIXME : Should use udelay() instead, even if we are x86 only - Jean II */ static void iodelay(int udelay) @@ -132,7 +132,7 @@ static struct pci_driver via_driver = { .name = VIA_MODULE_NAME, .id_table = via_pci_tbl, .probe = via_init_one, - .remove = __devexit_p(via_remove_one), + .remove = via_remove_one, }; @@ -156,7 +156,7 @@ static int __init via_ircc_init(void) return 0; } -static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_device_id *id) +static int via_init_one(struct pci_dev *pcidev, const struct pci_device_id *id) { int rc; u8 temp,oldPCI_40,oldPCI_44,bTmp,bTmp1; @@ -286,8 +286,7 @@ static const struct net_device_ops via_ircc_fir_ops = { * Open driver instance * */ -static __devinit int via_ircc_open(struct pci_dev *pdev, chipio_t * info, - unsigned int id) +static int via_ircc_open(struct pci_dev *pdev, chipio_t *info, unsigned int id) { struct net_device *dev; struct via_ircc_cb *self; @@ -424,7 +423,7 @@ static __devinit int via_ircc_open(struct pci_dev *pdev, chipio_t * info, * Close driver instance * */ -static void __devexit via_remove_one(struct pci_dev *pdev) +static void via_remove_one(struct pci_dev *pdev) { struct via_ircc_cb *self = pci_get_drvdata(pdev); int iobase; diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index 9021d0131727..2f99f8881dfc 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c @@ -1627,7 +1627,7 @@ static int vlsi_irda_init(struct net_device *ndev) /**************************************************************/ -static int __devinit +static int vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct net_device *ndev; @@ -1699,7 +1699,7 @@ out: return -ENODEV; } -static void __devexit vlsi_irda_remove(struct pci_dev *pdev) +static void vlsi_irda_remove(struct pci_dev *pdev) { struct net_device *ndev = pci_get_drvdata(pdev); vlsi_irda_dev_t *idev; @@ -1832,7 +1832,7 @@ static struct pci_driver vlsi_irda_driver = { .name = drivername, .id_table = vlsi_irda_table, .probe = vlsi_irda_probe, - .remove = __devexit_p(vlsi_irda_remove), + .remove = vlsi_irda_remove, #ifdef CONFIG_PM .suspend = vlsi_irda_suspend, .resume = vlsi_irda_resume, |