irda: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Samuel Ortiz <samuel@sortiz.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton
Greg Kroah-Hartman
Родитель
bb1f460675
Коммит
45ac936c3e
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -753,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;
|
||||
|
|
@ -825,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);
|
||||
|
|
@ -862,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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -376,7 +376,7 @@ 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,
|
||||
static int smsc_ircc_pnp_probe(struct pnp_dev *dev,
|
||||
const struct pnp_device_id *dev_id)
|
||||
{
|
||||
unsigned int firbase, sirbase;
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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,8 @@ 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 +424,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;
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче