Skip to content

L
linux
Commit 3c8ac0f2 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

can: 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: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: linux-can@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c47bab6
Show whitespace changes
Inline Side-by-side
Showing with 116 additions and 116 deletions
drivers/net/can/at91_can.c
View file @ 3c8ac0f2
...@@ -155,7 +155,7 @@ struct at91_priv { ...@@ -155,7 +155,7 @@ struct at91_priv {
canid_t mb0_id; canid_t mb0_id;
}; };
static const struct at91_devtype_data at91_devtype_data[] __devinitconst = { static const struct at91_devtype_data at91_devtype_data[] = {
[AT91_DEVTYPE_SAM9263] = { [AT91_DEVTYPE_SAM9263] = {
.rx_first = 1, .rx_first = 1,
.rx_split = 8, .rx_split = 8,
...@@ -1242,7 +1242,7 @@ static struct attribute_group at91_sysfs_attr_group = { ...@@ -1242,7 +1242,7 @@ static struct attribute_group at91_sysfs_attr_group = {
.attrs = at91_sysfs_attrs, .attrs = at91_sysfs_attrs,
}; };
static int __devinit at91_can_probe(struct platform_device *pdev) static int at91_can_probe(struct platform_device *pdev)
{ {
const struct at91_devtype_data *devtype_data; const struct at91_devtype_data *devtype_data;
enum at91_devtype devtype; enum at91_devtype devtype;
...@@ -1339,7 +1339,7 @@ static int __devinit at91_can_probe(struct platform_device *pdev) ...@@ -1339,7 +1339,7 @@ static int __devinit at91_can_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit at91_can_remove(struct platform_device *pdev) static int at91_can_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct at91_priv *priv = netdev_priv(dev); struct at91_priv *priv = netdev_priv(dev);
...@@ -1376,7 +1376,7 @@ MODULE_DEVICE_TABLE(platform, at91_can_id_table); ...@@ -1376,7 +1376,7 @@ MODULE_DEVICE_TABLE(platform, at91_can_id_table);
static struct platform_driver at91_can_driver = { static struct platform_driver at91_can_driver = {
.probe = at91_can_probe, .probe = at91_can_probe,
.remove = __devexit_p(at91_can_remove), .remove = at91_can_remove,
.driver = { .driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/net/can/bfin_can.c
View file @ 3c8ac0f2
...@@ -531,7 +531,7 @@ static const struct net_device_ops bfin_can_netdev_ops = { ...@@ -531,7 +531,7 @@ static const struct net_device_ops bfin_can_netdev_ops = {
.ndo_start_xmit = bfin_can_start_xmit, .ndo_start_xmit = bfin_can_start_xmit,
}; };
static int __devinit bfin_can_probe(struct platform_device *pdev) static int bfin_can_probe(struct platform_device *pdev)
{ {
int err; int err;
struct net_device *dev; struct net_device *dev;
...@@ -611,7 +611,7 @@ static int __devinit bfin_can_probe(struct platform_device *pdev) ...@@ -611,7 +611,7 @@ static int __devinit bfin_can_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit bfin_can_remove(struct platform_device *pdev) static int bfin_can_remove(struct platform_device *pdev)
{ {
struct net_device *dev = dev_get_drvdata(&pdev->dev); struct net_device *dev = dev_get_drvdata(&pdev->dev);
struct bfin_can_priv *priv = netdev_priv(dev); struct bfin_can_priv *priv = netdev_priv(dev);
...@@ -677,7 +677,7 @@ static int bfin_can_resume(struct platform_device *pdev) ...@@ -677,7 +677,7 @@ static int bfin_can_resume(struct platform_device *pdev)
static struct platform_driver bfin_can_driver = { static struct platform_driver bfin_can_driver = {
.probe = bfin_can_probe, .probe = bfin_can_probe,
.remove = __devexit_p(bfin_can_remove), .remove = bfin_can_remove,
.suspend = bfin_can_suspend, .suspend = bfin_can_suspend,
.resume = bfin_can_resume, .resume = bfin_can_resume,
.driver = { .driver = {
......
drivers/net/can/c_can/c_can_pci.c
View file @ 3c8ac0f2
...@@ -63,7 +63,7 @@ static void c_can_pci_write_reg_aligned_to_32bit(struct c_can_priv *priv, ...@@ -63,7 +63,7 @@ static void c_can_pci_write_reg_aligned_to_32bit(struct c_can_priv *priv,
writew(val, priv->base + 2 * priv->regs[index]); writew(val, priv->base + 2 * priv->regs[index]);
} }
static int __devinit c_can_pci_probe(struct pci_dev *pdev, static int c_can_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data; struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data;
...@@ -174,7 +174,7 @@ static int __devinit c_can_pci_probe(struct pci_dev *pdev, ...@@ -174,7 +174,7 @@ static int __devinit c_can_pci_probe(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit c_can_pci_remove(struct pci_dev *pdev) static void c_can_pci_remove(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct c_can_priv *priv = netdev_priv(dev); struct c_can_priv *priv = netdev_priv(dev);
...@@ -210,7 +210,7 @@ static struct pci_driver c_can_pci_driver = { ...@@ -210,7 +210,7 @@ static struct pci_driver c_can_pci_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = c_can_pci_tbl, .id_table = c_can_pci_tbl,
.probe = c_can_pci_probe, .probe = c_can_pci_probe,
.remove = __devexit_p(c_can_pci_remove), .remove = c_can_pci_remove,
}; };
module_pci_driver(c_can_pci_driver); module_pci_driver(c_can_pci_driver);
......
drivers/net/can/c_can/c_can_platform.c
View file @ 3c8ac0f2
...@@ -106,7 +106,7 @@ static const struct of_device_id c_can_of_table[] = { ...@@ -106,7 +106,7 @@ static const struct of_device_id c_can_of_table[] = {
}; };
MODULE_DEVICE_TABLE(of, c_can_of_table); MODULE_DEVICE_TABLE(of, c_can_of_table);
static int __devinit c_can_plat_probe(struct platform_device *pdev) static int c_can_plat_probe(struct platform_device *pdev)
{ {
int ret; int ret;
void __iomem *addr; void __iomem *addr;
...@@ -248,7 +248,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) ...@@ -248,7 +248,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit c_can_plat_remove(struct platform_device *pdev) static int c_can_plat_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct c_can_priv *priv = netdev_priv(dev); struct c_can_priv *priv = netdev_priv(dev);
...@@ -334,7 +334,7 @@ static struct platform_driver c_can_plat_driver = { ...@@ -334,7 +334,7 @@ static struct platform_driver c_can_plat_driver = {
.of_match_table = of_match_ptr(c_can_of_table), .of_match_table = of_match_ptr(c_can_of_table),
}, },
.probe = c_can_plat_probe, .probe = c_can_plat_probe,
.remove = __devexit_p(c_can_plat_remove), .remove = c_can_plat_remove,
.suspend = c_can_suspend, .suspend = c_can_suspend,
.resume = c_can_resume, .resume = c_can_resume,
.id_table = c_can_id_table, .id_table = c_can_id_table,
......
drivers/net/can/cc770/cc770_isa.c
View file @ 3c8ac0f2
...@@ -75,12 +75,12 @@ MODULE_LICENSE("GPL v2"); ...@@ -75,12 +75,12 @@ MODULE_LICENSE("GPL v2");
static unsigned long port[MAXDEV]; static unsigned long port[MAXDEV];
static unsigned long mem[MAXDEV]; static unsigned long mem[MAXDEV];
static int __devinitdata irq[MAXDEV]; static int irq[MAXDEV];
static int __devinitdata clk[MAXDEV]; static int clk[MAXDEV];
static u8 __devinitdata cir[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff}; static u8 cir[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static u8 __devinitdata cor[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff}; static u8 cor[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static u8 __devinitdata bcr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff}; static u8 bcr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static int __devinitdata indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1}; static int indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};
module_param_array(port, ulong, NULL, S_IRUGO); module_param_array(port, ulong, NULL, S_IRUGO);
MODULE_PARM_DESC(port, "I/O port number"); MODULE_PARM_DESC(port, "I/O port number");
...@@ -166,7 +166,7 @@ static void cc770_isa_port_write_reg_indirect(const struct cc770_priv *priv, ...@@ -166,7 +166,7 @@ static void cc770_isa_port_write_reg_indirect(const struct cc770_priv *priv,
spin_unlock_irqrestore(&cc770_isa_port_lock, flags); spin_unlock_irqrestore(&cc770_isa_port_lock, flags);
} }
static int __devinit cc770_isa_probe(struct platform_device *pdev) static int cc770_isa_probe(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
struct cc770_priv *priv; struct cc770_priv *priv;
...@@ -291,7 +291,7 @@ static int __devinit cc770_isa_probe(struct platform_device *pdev) ...@@ -291,7 +291,7 @@ static int __devinit cc770_isa_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit cc770_isa_remove(struct platform_device *pdev) static int cc770_isa_remove(struct platform_device *pdev)
{ {
struct net_device *dev = dev_get_drvdata(&pdev->dev); struct net_device *dev = dev_get_drvdata(&pdev->dev);
struct cc770_priv *priv = netdev_priv(dev); struct cc770_priv *priv = netdev_priv(dev);
...@@ -316,7 +316,7 @@ static int __devexit cc770_isa_remove(struct platform_device *pdev) ...@@ -316,7 +316,7 @@ static int __devexit cc770_isa_remove(struct platform_device *pdev)
static struct platform_driver cc770_isa_driver = { static struct platform_driver cc770_isa_driver = {
.probe = cc770_isa_probe, .probe = cc770_isa_probe,
.remove = __devexit_p(cc770_isa_remove), .remove = cc770_isa_remove,
.driver = { .driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/net/can/cc770/cc770_platform.c
View file @ 3c8ac0f2
...@@ -75,7 +75,7 @@ static void cc770_platform_write_reg(const struct cc770_priv *priv, int reg, ...@@ -75,7 +75,7 @@ static void cc770_platform_write_reg(const struct cc770_priv *priv, int reg,
iowrite8(val, priv->reg_base + reg); iowrite8(val, priv->reg_base + reg);
} }
static int __devinit cc770_get_of_node_data(struct platform_device *pdev, static int cc770_get_of_node_data(struct platform_device *pdev,
struct cc770_priv *priv) struct cc770_priv *priv)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
...@@ -148,7 +148,7 @@ static int __devinit cc770_get_of_node_data(struct platform_device *pdev, ...@@ -148,7 +148,7 @@ static int __devinit cc770_get_of_node_data(struct platform_device *pdev,
return 0; return 0;
} }
static int __devinit cc770_get_platform_data(struct platform_device *pdev, static int cc770_get_platform_data(struct platform_device *pdev,
struct cc770_priv *priv) struct cc770_priv *priv)
{ {
...@@ -164,7 +164,7 @@ static int __devinit cc770_get_platform_data(struct platform_device *pdev, ...@@ -164,7 +164,7 @@ static int __devinit cc770_get_platform_data(struct platform_device *pdev,
return 0; return 0;
} }
static int __devinit cc770_platform_probe(struct platform_device *pdev) static int cc770_platform_probe(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
struct cc770_priv *priv; struct cc770_priv *priv;
...@@ -238,7 +238,7 @@ static int __devinit cc770_platform_probe(struct platform_device *pdev) ...@@ -238,7 +238,7 @@ static int __devinit cc770_platform_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit cc770_platform_remove(struct platform_device *pdev) static int cc770_platform_remove(struct platform_device *pdev)
{ {
struct net_device *dev = dev_get_drvdata(&pdev->dev); struct net_device *dev = dev_get_drvdata(&pdev->dev);
struct cc770_priv *priv = netdev_priv(dev); struct cc770_priv *priv = netdev_priv(dev);
...@@ -254,7 +254,7 @@ static int __devexit cc770_platform_remove(struct platform_device *pdev) ...@@ -254,7 +254,7 @@ static int __devexit cc770_platform_remove(struct platform_device *pdev)
return 0; return 0;
} }
static struct of_device_id __devinitdata cc770_platform_table[] = { static struct of_device_id cc770_platform_table[] = {
{.compatible = "bosch,cc770"}, /* CC770 from Bosch */ {.compatible = "bosch,cc770"}, /* CC770 from Bosch */
{.compatible = "intc,82527"}, /* AN82527 from Intel CP */ {.compatible = "intc,82527"}, /* AN82527 from Intel CP */
{}, {},
...@@ -268,7 +268,7 @@ static struct platform_driver cc770_platform_driver = { ...@@ -268,7 +268,7 @@ static struct platform_driver cc770_platform_driver = {
.of_match_table = cc770_platform_table, .of_match_table = cc770_platform_table,
}, },
.probe = cc770_platform_probe, .probe = cc770_platform_probe,
.remove = __devexit_p(cc770_platform_remove), .remove = cc770_platform_remove,
}; };
module_platform_driver(cc770_platform_driver); module_platform_driver(cc770_platform_driver);
drivers/net/can/flexcan.c
View file @ 3c8ac0f2
...@@ -922,7 +922,7 @@ static const struct net_device_ops flexcan_netdev_ops = { ...@@ -922,7 +922,7 @@ static const struct net_device_ops flexcan_netdev_ops = {
.ndo_start_xmit = flexcan_start_xmit, .ndo_start_xmit = flexcan_start_xmit,
}; };
static int __devinit register_flexcandev(struct net_device *dev) static int register_flexcandev(struct net_device *dev)
{ {
struct flexcan_priv *priv = netdev_priv(dev); struct flexcan_priv *priv = netdev_priv(dev);
struct flexcan_regs __iomem *regs = priv->base; struct flexcan_regs __iomem *regs = priv->base;
...@@ -968,7 +968,7 @@ static int __devinit register_flexcandev(struct net_device *dev) ...@@ -968,7 +968,7 @@ static int __devinit register_flexcandev(struct net_device *dev)
return err; return err;
} }
static void __devexit unregister_flexcandev(struct net_device *dev) static void unregister_flexcandev(struct net_device *dev)
{ {
unregister_candev(dev); unregister_candev(dev);
} }
...@@ -987,7 +987,7 @@ static const struct platform_device_id flexcan_id_table[] = { ...@@ -987,7 +987,7 @@ static const struct platform_device_id flexcan_id_table[] = {
}; };
MODULE_DEVICE_TABLE(platform, flexcan_id_table); MODULE_DEVICE_TABLE(platform, flexcan_id_table);
static int __devinit flexcan_probe(struct platform_device *pdev) static int flexcan_probe(struct platform_device *pdev)
{ {
const struct of_device_id *of_id; const struct of_device_id *of_id;
const struct flexcan_devtype_data *devtype_data; const struct flexcan_devtype_data *devtype_data;
...@@ -1109,7 +1109,7 @@ static int __devinit flexcan_probe(struct platform_device *pdev) ...@@ -1109,7 +1109,7 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit flexcan_remove(struct platform_device *pdev) static int flexcan_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct flexcan_priv *priv = netdev_priv(dev); struct flexcan_priv *priv = netdev_priv(dev);
...@@ -1170,7 +1170,7 @@ static struct platform_driver flexcan_driver = { ...@@ -1170,7 +1170,7 @@ static struct platform_driver flexcan_driver = {
.of_match_table = flexcan_of_match, .of_match_table = flexcan_of_match,
}, },
.probe = flexcan_probe, .probe = flexcan_probe,
.remove = __devexit_p(flexcan_remove), .remove = flexcan_remove,
.suspend = flexcan_suspend, .suspend = flexcan_suspend,
.resume = flexcan_resume, .resume = flexcan_resume,
.id_table = flexcan_id_table, .id_table = flexcan_id_table,
......
drivers/net/can/grcan.c
View file @ 3c8ac0f2
...@@ -1659,7 +1659,7 @@ static int grcan_setup_netdev(struct platform_device *ofdev, ...@@ -1659,7 +1659,7 @@ static int grcan_setup_netdev(struct platform_device *ofdev,
return err; return err;
} }
static int __devinit grcan_probe(struct platform_device *ofdev) static int grcan_probe(struct platform_device *ofdev)
{ {
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
struct resource *res; struct resource *res;
...@@ -1714,7 +1714,7 @@ static int __devinit grcan_probe(struct platform_device *ofdev) ...@@ -1714,7 +1714,7 @@ static int __devinit grcan_probe(struct platform_device *ofdev)
return err; return err;
} }
static int __devexit grcan_remove(struct platform_device *ofdev) static int grcan_remove(struct platform_device *ofdev)
{ {
struct net_device *dev = dev_get_drvdata(&ofdev->dev); struct net_device *dev = dev_get_drvdata(&ofdev->dev);
struct grcan_priv *priv = netdev_priv(dev); struct grcan_priv *priv = netdev_priv(dev);
...@@ -1729,7 +1729,7 @@ static int __devexit grcan_remove(struct platform_device *ofdev) ...@@ -1729,7 +1729,7 @@ static int __devexit grcan_remove(struct platform_device *ofdev)
return 0; return 0;
} }
static struct of_device_id grcan_match[] __devinitconst = { static struct of_device_id grcan_match[] = {
{.name = "GAISLER_GRCAN"}, {.name = "GAISLER_GRCAN"},
{.name = "01_03d"}, {.name = "01_03d"},
{.name = "GAISLER_GRHCAN"}, {.name = "GAISLER_GRHCAN"},
...@@ -1746,7 +1746,7 @@ static struct platform_driver grcan_driver = { ...@@ -1746,7 +1746,7 @@ static struct platform_driver grcan_driver = {
.of_match_table = grcan_match, .of_match_table = grcan_match,
}, },
.probe = grcan_probe, .probe = grcan_probe,
.remove = __devexit_p(grcan_remove), .remove = grcan_remove,
}; };
module_platform_driver(grcan_driver); module_platform_driver(grcan_driver);
......
drivers/net/can/janz-ican3.c
View file @ 3c8ac0f2
...@@ -365,7 +365,7 @@ static int ican3_old_send_msg(struct ican3_dev *mod, struct ican3_msg *msg) ...@@ -365,7 +365,7 @@ static int ican3_old_send_msg(struct ican3_dev *mod, struct ican3_msg *msg)
* ICAN3 "new-style" Host Interface Setup * ICAN3 "new-style" Host Interface Setup
*/ */
static void __devinit ican3_init_new_host_interface(struct ican3_dev *mod) static void ican3_init_new_host_interface(struct ican3_dev *mod)
{ {
struct ican3_new_desc desc; struct ican3_new_desc desc;
unsigned long flags; unsigned long flags;
...@@ -444,7 +444,7 @@ static void __devinit ican3_init_new_host_interface(struct ican3_dev *mod) ...@@ -444,7 +444,7 @@ static void __devinit ican3_init_new_host_interface(struct ican3_dev *mod)
* ICAN3 Fast Host Interface Setup * ICAN3 Fast Host Interface Setup
*/ */
static void __devinit ican3_init_fast_host_interface(struct ican3_dev *mod) static void ican3_init_fast_host_interface(struct ican3_dev *mod)
{ {
struct ican3_fast_desc desc; struct ican3_fast_desc desc;
unsigned long flags; unsigned long flags;
...@@ -631,7 +631,7 @@ static int ican3_recv_msg(struct ican3_dev *mod, struct ican3_msg *msg) ...@@ -631,7 +631,7 @@ static int ican3_recv_msg(struct ican3_dev *mod, struct ican3_msg *msg)
* Quick Pre-constructed Messages * Quick Pre-constructed Messages
*/ */
static int __devinit ican3_msg_connect(struct ican3_dev *mod) static int ican3_msg_connect(struct ican3_dev *mod)
{ {
struct ican3_msg msg; struct ican3_msg msg;
...@@ -642,7 +642,7 @@ static int __devinit ican3_msg_connect(struct ican3_dev *mod) ...@@ -642,7 +642,7 @@ static int __devinit ican3_msg_connect(struct ican3_dev *mod)
return ican3_send_msg(mod, &msg); return ican3_send_msg(mod, &msg);
} }
static int __devexit ican3_msg_disconnect(struct ican3_dev *mod) static int ican3_msg_disconnect(struct ican3_dev *mod)
{ {
struct ican3_msg msg; struct ican3_msg msg;
...@@ -653,7 +653,7 @@ static int __devexit ican3_msg_disconnect(struct ican3_dev *mod) ...@@ -653,7 +653,7 @@ static int __devexit ican3_msg_disconnect(struct ican3_dev *mod)
return ican3_send_msg(mod, &msg); return ican3_send_msg(mod, &msg);
} }
static int __devinit ican3_msg_newhostif(struct ican3_dev *mod) static int ican3_msg_newhostif(struct ican3_dev *mod)
{ {
struct ican3_msg msg; struct ican3_msg msg;
int ret; int ret;
...@@ -674,7 +674,7 @@ static int __devinit ican3_msg_newhostif(struct ican3_dev *mod) ...@@ -674,7 +674,7 @@ static int __devinit ican3_msg_newhostif(struct ican3_dev *mod)
return 0; return 0;
} }
static int __devinit ican3_msg_fasthostif(struct ican3_dev *mod) static int ican3_msg_fasthostif(struct ican3_dev *mod)
{ {
struct ican3_msg msg; struct ican3_msg msg;
unsigned int addr; unsigned int addr;
...@@ -707,7 +707,7 @@ static int __devinit ican3_msg_fasthostif(struct ican3_dev *mod) ...@@ -707,7 +707,7 @@ static int __devinit ican3_msg_fasthostif(struct ican3_dev *mod)
* Setup the CAN filter to either accept or reject all * Setup the CAN filter to either accept or reject all
* messages from the CAN bus. * messages from the CAN bus.
*/ */
static int __devinit ican3_set_id_filter(struct ican3_dev *mod, bool accept) static int ican3_set_id_filter(struct ican3_dev *mod, bool accept)
{ {
struct ican3_msg msg; struct ican3_msg msg;
int ret; int ret;
...@@ -1421,7 +1421,7 @@ static int ican3_reset_module(struct ican3_dev *mod) ...@@ -1421,7 +1421,7 @@ static int ican3_reset_module(struct ican3_dev *mod)
return -ETIMEDOUT; return -ETIMEDOUT;
} }
static void __devexit ican3_shutdown_module(struct ican3_dev *mod) static void ican3_shutdown_module(struct ican3_dev *mod)
{ {
ican3_msg_disconnect(mod); ican3_msg_disconnect(mod);
ican3_reset_module(mod); ican3_reset_module(mod);
...@@ -1430,7 +1430,7 @@ static void __devexit ican3_shutdown_module(struct ican3_dev *mod) ...@@ -1430,7 +1430,7 @@ static void __devexit ican3_shutdown_module(struct ican3_dev *mod)
/* /*
* Startup an ICAN module, bringing it into fast mode * Startup an ICAN module, bringing it into fast mode
*/ */
static int __devinit ican3_startup_module(struct ican3_dev *mod) static int ican3_startup_module(struct ican3_dev *mod)
{ {
int ret; int ret;
...@@ -1760,7 +1760,7 @@ static struct attribute_group ican3_sysfs_attr_group = { ...@@ -1760,7 +1760,7 @@ static struct attribute_group ican3_sysfs_attr_group = {
* PCI Subsystem * PCI Subsystem
*/ */
static int __devinit ican3_probe(struct platform_device *pdev) static int ican3_probe(struct platform_device *pdev)
{ {
struct janz_platform_data *pdata; struct janz_platform_data *pdata;
struct net_device *ndev; struct net_device *ndev;
...@@ -1898,7 +1898,7 @@ static int __devinit ican3_probe(struct platform_device *pdev) ...@@ -1898,7 +1898,7 @@ static int __devinit ican3_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit ican3_remove(struct platform_device *pdev) static int ican3_remove(struct platform_device *pdev)
{ {
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
struct ican3_dev *mod = netdev_priv(ndev); struct ican3_dev *mod = netdev_priv(ndev);
...@@ -1927,7 +1927,7 @@ static struct platform_driver ican3_driver = { ...@@ -1927,7 +1927,7 @@ static struct platform_driver ican3_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ican3_probe, .probe = ican3_probe,
.remove = __devexit_p(ican3_remove), .remove = ican3_remove,
}; };
module_platform_driver(ican3_driver); module_platform_driver(ican3_driver);
......
drivers/net/can/mcp251x.c
View file @ 3c8ac0f2
...@@ -981,7 +981,7 @@ static const struct net_device_ops mcp251x_netdev_ops = { ...@@ -981,7 +981,7 @@ static const struct net_device_ops mcp251x_netdev_ops = {
.ndo_start_xmit = mcp251x_hard_start_xmit, .ndo_start_xmit = mcp251x_hard_start_xmit,
}; };
static int __devinit mcp251x_can_probe(struct spi_device *spi) static int mcp251x_can_probe(struct spi_device *spi)
{ {
struct net_device *net; struct net_device *net;
struct mcp251x_priv *priv; struct mcp251x_priv *priv;
...@@ -1100,7 +1100,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi) ...@@ -1100,7 +1100,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi)
return ret; return ret;
} }
static int __devexit mcp251x_can_remove(struct spi_device *spi) static int mcp251x_can_remove(struct spi_device *spi)
{ {
struct mcp251x_platform_data *pdata = spi->dev.platform_data; struct mcp251x_platform_data *pdata = spi->dev.platform_data;
struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
...@@ -1198,7 +1198,7 @@ static struct spi_driver mcp251x_can_driver = { ...@@ -1198,7 +1198,7 @@ static struct spi_driver mcp251x_can_driver = {
.id_table = mcp251x_id_table, .id_table = mcp251x_id_table,
.probe = mcp251x_can_probe, .probe = mcp251x_can_probe,
.remove = __devexit_p(mcp251x_can_remove), .remove = mcp251x_can_remove,
.suspend = mcp251x_can_suspend, .suspend = mcp251x_can_suspend,
.resume = mcp251x_can_resume, .resume = mcp251x_can_resume,
}; };
......
drivers/net/can/mscan/mpc5xxx_can.c
View file @ 3c8ac0f2
...@@ -43,12 +43,12 @@ struct mpc5xxx_can_data { ...@@ -43,12 +43,12 @@ struct mpc5xxx_can_data {
}; };
#ifdef CONFIG_PPC_MPC52xx #ifdef CONFIG_PPC_MPC52xx
static struct of_device_id __devinitdata mpc52xx_cdm_ids[] = { static struct of_device_id mpc52xx_cdm_ids[] = {
{ .compatible = "fsl,mpc5200-cdm", }, { .compatible = "fsl,mpc5200-cdm", },
{} {}
}; };
static u32 __devinit mpc52xx_can_get_clock(struct platform_device *ofdev, static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
const char *clock_name, const char *clock_name,
int *mscan_clksrc) int *mscan_clksrc)
{ {
...@@ -101,7 +101,7 @@ static u32 __devinit mpc52xx_can_get_clock(struct platform_device *ofdev, ...@@ -101,7 +101,7 @@ static u32 __devinit mpc52xx_can_get_clock(struct platform_device *ofdev,
return freq; return freq;
} }
#else /* !CONFIG_PPC_MPC52xx */ #else /* !CONFIG_PPC_MPC52xx */
static u32 __devinit mpc52xx_can_get_clock(struct platform_device *ofdev, static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
const char *clock_name, const char *clock_name,
int *mscan_clksrc) int *mscan_clksrc)
{ {
...@@ -124,12 +124,12 @@ struct mpc512x_clockctl { ...@@ -124,12 +124,12 @@ struct mpc512x_clockctl {
u32 mccr[4]; /* MSCAN Clk Ctrl Reg 1-3 */ u32 mccr[4]; /* MSCAN Clk Ctrl Reg 1-3 */
}; };
static struct of_device_id __devinitdata mpc512x_clock_ids[] = { static struct of_device_id mpc512x_clock_ids[] = {
{ .compatible = "fsl,mpc5121-clock", }, { .compatible = "fsl,mpc5121-clock", },
{} {}
}; };
static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev, static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
const char *clock_name, const char *clock_name,
int *mscan_clksrc) int *mscan_clksrc)
{ {
...@@ -239,7 +239,7 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev, ...@@ -239,7 +239,7 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev,
return freq; return freq;
} }
#else /* !CONFIG_PPC_MPC512x */ #else /* !CONFIG_PPC_MPC512x */
static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev, static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
const char *clock_name, const char *clock_name,
int *mscan_clksrc) int *mscan_clksrc)
{ {
...@@ -248,7 +248,7 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev, ...@@ -248,7 +248,7 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev,
#endif /* CONFIG_PPC_MPC512x */ #endif /* CONFIG_PPC_MPC512x */
static const struct of_device_id mpc5xxx_can_table[]; static const struct of_device_id mpc5xxx_can_table[];
static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev) static int mpc5xxx_can_probe(struct platform_device *ofdev)
{ {
const struct of_device_id *match; const struct of_device_id *match;
const struct mpc5xxx_can_data *data; const struct mpc5xxx_can_data *data;
...@@ -323,7 +323,7 @@ static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev) ...@@ -323,7 +323,7 @@ static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev)
return err; return err;
} }
static int __devexit mpc5xxx_can_remove(struct platform_device *ofdev) static int mpc5xxx_can_remove(struct platform_device *ofdev)
{ {
struct net_device *dev = dev_get_drvdata(&ofdev->dev); struct net_device *dev = dev_get_drvdata(&ofdev->dev);
struct mscan_priv *priv = netdev_priv(dev); struct mscan_priv *priv = netdev_priv(dev);
...@@ -380,17 +380,17 @@ static int mpc5xxx_can_resume(struct platform_device *ofdev) ...@@ -380,17 +380,17 @@ static int mpc5xxx_can_resume(struct platform_device *ofdev)
} }
#endif #endif
static const struct mpc5xxx_can_data __devinitconst mpc5200_can_data = { static const struct mpc5xxx_can_data mpc5200_can_data = {
.type = MSCAN_TYPE_MPC5200, .type = MSCAN_TYPE_MPC5200,
.get_clock = mpc52xx_can_get_clock, .get_clock = mpc52xx_can_get_clock,
}; };
static const struct mpc5xxx_can_data __devinitconst mpc5121_can_data = { static const struct mpc5xxx_can_data mpc5121_can_data = {
.type = MSCAN_TYPE_MPC5121, .type = MSCAN_TYPE_MPC5121,
.get_clock = mpc512x_can_get_clock, .get_clock = mpc512x_can_get_clock,
}; };
static const struct of_device_id __devinitconst mpc5xxx_can_table[] = { static const struct of_device_id mpc5xxx_can_table[] = {
{ .compatible = "fsl,mpc5200-mscan", .data = &mpc5200_can_data, }, { .compatible = "fsl,mpc5200-mscan", .data = &mpc5200_can_data, },
/* Note that only MPC5121 Rev. 2 (and later) is supported */ /* Note that only MPC5121 Rev. 2 (and later) is supported */
{ .compatible = "fsl,mpc5121-mscan", .data = &mpc5121_can_data, }, { .compatible = "fsl,mpc5121-mscan", .data = &mpc5121_can_data, },
...@@ -405,7 +405,7 @@ static struct platform_driver mpc5xxx_can_driver = { ...@@ -405,7 +405,7 @@ static struct platform_driver mpc5xxx_can_driver = {
.of_match_table = mpc5xxx_can_table, .of_match_table = mpc5xxx_can_table,
}, },
.probe = mpc5xxx_can_probe, .probe = mpc5xxx_can_probe,
.remove = __devexit_p(mpc5xxx_can_remove), .remove = mpc5xxx_can_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = mpc5xxx_can_suspend, .suspend = mpc5xxx_can_suspend,
.resume = mpc5xxx_can_resume, .resume = mpc5xxx_can_resume,
......
drivers/net/can/pch_can.c
View file @ 3c8ac0f2
...@@ -954,7 +954,7 @@ static const struct net_device_ops pch_can_netdev_ops = { ...@@ -954,7 +954,7 @@ static const struct net_device_ops pch_can_netdev_ops = {
.ndo_start_xmit = pch_xmit, .ndo_start_xmit = pch_xmit,
}; };
static void __devexit pch_can_remove(struct pci_dev *pdev) static void pch_can_remove(struct pci_dev *pdev)
{ {
struct net_device *ndev = pci_get_drvdata(pdev); struct net_device *ndev = pci_get_drvdata(pdev);
struct pch_can_priv *priv = netdev_priv(ndev); struct pch_can_priv *priv = netdev_priv(ndev);
...@@ -1178,7 +1178,7 @@ static int pch_can_get_berr_counter(const struct net_device *dev, ...@@ -1178,7 +1178,7 @@ static int pch_can_get_berr_counter(const struct net_device *dev,
return 0; return 0;
} }
static int __devinit pch_can_probe(struct pci_dev *pdev, static int pch_can_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct net_device *ndev; struct net_device *ndev;
...@@ -1269,7 +1269,7 @@ static struct pci_driver pch_can_pci_driver = { ...@@ -1269,7 +1269,7 @@ static struct pci_driver pch_can_pci_driver = {
.name = "pch_can", .name = "pch_can",
.id_table = pch_pci_tbl, .id_table = pch_pci_tbl,
.probe = pch_can_probe, .probe = pch_can_probe,
.remove = __devexit_p(pch_can_remove), .remove = pch_can_remove,
.suspend = pch_can_suspend, .suspend = pch_can_suspend,
.resume = pch_can_resume, .resume = pch_can_resume,
}; };
......
drivers/net/can/sja1000/ems_pci.c
View file @ 3c8ac0f2
...@@ -220,7 +220,7 @@ static void ems_pci_card_reset(struct ems_pci_card *card) ...@@ -220,7 +220,7 @@ static void ems_pci_card_reset(struct ems_pci_card *card)
* Probe PCI device for EMS CAN signature and register each available * Probe PCI device for EMS CAN signature and register each available
* CAN channel to SJA1000 Socket-CAN subsystem. * CAN channel to SJA1000 Socket-CAN subsystem.
*/ */
static int __devinit ems_pci_add_card(struct pci_dev *pdev, static int ems_pci_add_card(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct sja1000_priv *priv; struct sja1000_priv *priv;
......
drivers/net/can/sja1000/ems_pcmcia.c
View file @ 3c8ac0f2
...@@ -166,7 +166,7 @@ static void ems_pcmcia_del_card(struct pcmcia_device *pdev) ...@@ -166,7 +166,7 @@ static void ems_pcmcia_del_card(struct pcmcia_device *pdev)
* Probe PCI device for EMS CAN signature and register each available * Probe PCI device for EMS CAN signature and register each available
* CAN channel to SJA1000 Socket-CAN subsystem. * CAN channel to SJA1000 Socket-CAN subsystem.
*/ */
static int __devinit ems_pcmcia_add_card(struct pcmcia_device *pdev, static int ems_pcmcia_add_card(struct pcmcia_device *pdev,
unsigned long base) unsigned long base)
{ {
struct sja1000_priv *priv; struct sja1000_priv *priv;
...@@ -256,7 +256,7 @@ static int __devinit ems_pcmcia_add_card(struct pcmcia_device *pdev, ...@@ -256,7 +256,7 @@ static int __devinit ems_pcmcia_add_card(struct pcmcia_device *pdev,
/* /*
* Setup PCMCIA socket and probe for EMS CPC-CARD * Setup PCMCIA socket and probe for EMS CPC-CARD
*/ */
static int __devinit ems_pcmcia_probe(struct pcmcia_device *dev) static int ems_pcmcia_probe(struct pcmcia_device *dev)
{ {
int csval; int csval;
......
drivers/net/can/sja1000/kvaser_pci.c
View file @ 3c8ac0f2
...@@ -290,7 +290,7 @@ static int kvaser_pci_add_chan(struct pci_dev *pdev, int channel, ...@@ -290,7 +290,7 @@ static int kvaser_pci_add_chan(struct pci_dev *pdev, int channel,
return err; return err;
} }
static int __devinit kvaser_pci_init_one(struct pci_dev *pdev, static int kvaser_pci_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int err; int err;
...@@ -379,7 +379,7 @@ static int __devinit kvaser_pci_init_one(struct pci_dev *pdev, ...@@ -379,7 +379,7 @@ static int __devinit kvaser_pci_init_one(struct pci_dev *pdev,
} }
static void __devexit kvaser_pci_remove_one(struct pci_dev *pdev) static void kvaser_pci_remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
...@@ -394,7 +394,7 @@ static struct pci_driver kvaser_pci_driver = { ...@@ -394,7 +394,7 @@ static struct pci_driver kvaser_pci_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = kvaser_pci_tbl, .id_table = kvaser_pci_tbl,
.probe = kvaser_pci_init_one, .probe = kvaser_pci_init_one,
.remove = __devexit_p(kvaser_pci_remove_one), .remove = kvaser_pci_remove_one,
}; };
module_pci_driver(kvaser_pci_driver); module_pci_driver(kvaser_pci_driver);
drivers/net/can/sja1000/peak_pci.c
View file @ 3c8ac0f2
...@@ -551,7 +551,7 @@ static void peak_pci_post_irq(const struct sja1000_priv *priv) ...@@ -551,7 +551,7 @@ static void peak_pci_post_irq(const struct sja1000_priv *priv)
writew(chan->icr_mask, chan->cfg_base + PITA_ICR); writew(chan->icr_mask, chan->cfg_base + PITA_ICR);
} }
static int __devinit peak_pci_probe(struct pci_dev *pdev, static int peak_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct sja1000_priv *priv; struct sja1000_priv *priv;
...@@ -717,7 +717,7 @@ static int __devinit peak_pci_probe(struct pci_dev *pdev, ...@@ -717,7 +717,7 @@ static int __devinit peak_pci_probe(struct pci_dev *pdev,
return err; return err;
} }
static void __devexit peak_pci_remove(struct pci_dev *pdev) static void peak_pci_remove(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); /* Last device */ struct net_device *dev = pci_get_drvdata(pdev); /* Last device */
struct sja1000_priv *priv = netdev_priv(dev); struct sja1000_priv *priv = netdev_priv(dev);
...@@ -757,7 +757,7 @@ static struct pci_driver peak_pci_driver = { ...@@ -757,7 +757,7 @@ static struct pci_driver peak_pci_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = peak_pci_tbl, .id_table = peak_pci_tbl,
.probe = peak_pci_probe, .probe = peak_pci_probe,
.remove = __devexit_p(peak_pci_remove), .remove = peak_pci_remove,
}; };
module_pci_driver(peak_pci_driver); module_pci_driver(peak_pci_driver);
drivers/net/can/sja1000/peak_pcmcia.c
View file @ 3c8ac0f2
...@@ -632,7 +632,7 @@ static void pcan_free(struct pcmcia_device *pdev) ...@@ -632,7 +632,7 @@ static void pcan_free(struct pcmcia_device *pdev)
/* /*
* setup PCMCIA socket and probe for PEAK-System PC-CARD * setup PCMCIA socket and probe for PEAK-System PC-CARD
*/ */
static int __devinit pcan_probe(struct pcmcia_device *pdev) static int pcan_probe(struct pcmcia_device *pdev)
{ {
struct pcan_pccard *card; struct pcan_pccard *card;
int err; int err;
......
drivers/net/can/sja1000/plx_pci.c
View file @ 3c8ac0f2
...@@ -162,7 +162,7 @@ struct plx_pci_card_info { ...@@ -162,7 +162,7 @@ struct plx_pci_card_info {
void (*reset_func)(struct pci_dev *pdev); void (*reset_func)(struct pci_dev *pdev);
}; };
static struct plx_pci_card_info plx_pci_card_info_adlink __devinitdata = { static struct plx_pci_card_info plx_pci_card_info_adlink = {
"Adlink PCI-7841/cPCI-7841", 2, "Adlink PCI-7841/cPCI-7841", 2,
PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR, PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
{1, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x80, 0x80} }, {1, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x80, 0x80} },
...@@ -170,7 +170,7 @@ static struct plx_pci_card_info plx_pci_card_info_adlink __devinitdata = { ...@@ -170,7 +170,7 @@ static struct plx_pci_card_info plx_pci_card_info_adlink __devinitdata = {
/* based on PLX9052 */ /* based on PLX9052 */
}; };
static struct plx_pci_card_info plx_pci_card_info_adlink_se __devinitdata = { static struct plx_pci_card_info plx_pci_card_info_adlink_se = {
"Adlink PCI-7841/cPCI-7841 SE", 2, "Adlink PCI-7841/cPCI-7841 SE", 2,
PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR, PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
{0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x80, 0x80} }, {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x80, 0x80} },
...@@ -178,7 +178,7 @@ static struct plx_pci_card_info plx_pci_card_info_adlink_se __devinitdata = { ...@@ -178,7 +178,7 @@ static struct plx_pci_card_info plx_pci_card_info_adlink_se __devinitdata = {
/* based on PLX9052 */ /* based on PLX9052 */
}; };
static struct plx_pci_card_info plx_pci_card_info_esd200 __devinitdata = { static struct plx_pci_card_info plx_pci_card_info_esd200 = {
"esd CAN-PCI/CPCI/PCI104/200", 2, "esd CAN-PCI/CPCI/PCI104/200", 2,
PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR, PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
{0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x100, 0x80} }, {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x100, 0x80} },
...@@ -186,7 +186,7 @@ static struct plx_pci_card_info plx_pci_card_info_esd200 __devinitdata = { ...@@ -186,7 +186,7 @@ static struct plx_pci_card_info plx_pci_card_info_esd200 __devinitdata = {
/* based on PLX9030/9050 */ /* based on PLX9030/9050 */
}; };
static struct plx_pci_card_info plx_pci_card_info_esd266 __devinitdata = { static struct plx_pci_card_info plx_pci_card_info_esd266 = {
"esd CAN-PCI/PMC/266", 2, "esd CAN-PCI/PMC/266", 2,
PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR, PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
{0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x100, 0x80} }, {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x100, 0x80} },
...@@ -194,7 +194,7 @@ static struct plx_pci_card_info plx_pci_card_info_esd266 __devinitdata = { ...@@ -194,7 +194,7 @@ static struct plx_pci_card_info plx_pci_card_info_esd266 __devinitdata = {
/* based on PLX9056 */ /* based on PLX9056 */
}; };
static struct plx_pci_card_info plx_pci_card_info_esd2000 __devinitdata = { static struct plx_pci_card_info plx_pci_card_info_esd2000 = {
"esd CAN-PCIe/2000", 2, "esd CAN-PCIe/2000", 2,
PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR, PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
{0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x100, 0x80} }, {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x100, 0x80} },
...@@ -202,7 +202,7 @@ static struct plx_pci_card_info plx_pci_card_info_esd2000 __devinitdata = { ...@@ -202,7 +202,7 @@ static struct plx_pci_card_info plx_pci_card_info_esd2000 __devinitdata = {
/* based on PEX8311 */ /* based on PEX8311 */
}; };
static struct plx_pci_card_info plx_pci_card_info_ixxat __devinitdata = { static struct plx_pci_card_info plx_pci_card_info_ixxat = {
"IXXAT PC-I 04/PCI", 2, "IXXAT PC-I 04/PCI", 2,
PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR, PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
{0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x200, 0x80} }, {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x200, 0x80} },
...@@ -210,7 +210,7 @@ static struct plx_pci_card_info plx_pci_card_info_ixxat __devinitdata = { ...@@ -210,7 +210,7 @@ static struct plx_pci_card_info plx_pci_card_info_ixxat __devinitdata = {
/* based on PLX9050 */ /* based on PLX9050 */
}; };
static struct plx_pci_card_info plx_pci_card_info_marathon __devinitdata = { static struct plx_pci_card_info plx_pci_card_info_marathon = {
"Marathon CAN-bus-PCI", 2, "Marathon CAN-bus-PCI", 2,
PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR, PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
{0, 0x00, 0x00}, { {2, 0x00, 0x00}, {4, 0x00, 0x00} }, {0, 0x00, 0x00}, { {2, 0x00, 0x00}, {4, 0x00, 0x00} },
...@@ -218,7 +218,7 @@ static struct plx_pci_card_info plx_pci_card_info_marathon __devinitdata = { ...@@ -218,7 +218,7 @@ static struct plx_pci_card_info plx_pci_card_info_marathon __devinitdata = {
/* based on PLX9052 */ /* based on PLX9052 */
}; };
static struct plx_pci_card_info plx_pci_card_info_tews __devinitdata = { static struct plx_pci_card_info plx_pci_card_info_tews = {
"TEWS TECHNOLOGIES TPMC810", 2, "TEWS TECHNOLOGIES TPMC810", 2,
PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR, PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
{0, 0x00, 0x00}, { {2, 0x000, 0x80}, {2, 0x100, 0x80} }, {0, 0x00, 0x00}, { {2, 0x000, 0x80}, {2, 0x100, 0x80} },
...@@ -226,7 +226,7 @@ static struct plx_pci_card_info plx_pci_card_info_tews __devinitdata = { ...@@ -226,7 +226,7 @@ static struct plx_pci_card_info plx_pci_card_info_tews __devinitdata = {
/* based on PLX9030 */ /* based on PLX9030 */
}; };
static struct plx_pci_card_info plx_pci_card_info_cti __devinitdata = { static struct plx_pci_card_info plx_pci_card_info_cti = {
"Connect Tech Inc. CANpro/104-Plus Opto (CRG001)", 2, "Connect Tech Inc. CANpro/104-Plus Opto (CRG001)", 2,
PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR, PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
{0, 0x00, 0x00}, { {2, 0x000, 0x80}, {2, 0x100, 0x80} }, {0, 0x00, 0x00}, { {2, 0x000, 0x80}, {2, 0x100, 0x80} },
...@@ -484,7 +484,7 @@ static void plx_pci_del_card(struct pci_dev *pdev) ...@@ -484,7 +484,7 @@ static void plx_pci_del_card(struct pci_dev *pdev)
* Probe PLX90xx based device for the SJA1000 chips and register each * Probe PLX90xx based device for the SJA1000 chips and register each
* available CAN channel to SJA1000 Socket-CAN subsystem. * available CAN channel to SJA1000 Socket-CAN subsystem.
*/ */
static int __devinit plx_pci_add_card(struct pci_dev *pdev, static int plx_pci_add_card(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct sja1000_priv *priv; struct sja1000_priv *priv;
......
drivers/net/can/sja1000/sja1000_isa.c
View file @ 3c8ac0f2
...@@ -42,11 +42,11 @@ MODULE_LICENSE("GPL v2"); ...@@ -42,11 +42,11 @@ MODULE_LICENSE("GPL v2");
static unsigned long port[MAXDEV]; static unsigned long port[MAXDEV];
static unsigned long mem[MAXDEV]; static unsigned long mem[MAXDEV];
static int __devinitdata irq[MAXDEV]; static int irq[MAXDEV];
static int __devinitdata clk[MAXDEV]; static int clk[MAXDEV];
static unsigned char __devinitdata cdr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff}; static unsigned char cdr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static unsigned char __devinitdata ocr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff}; static unsigned char ocr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static int __devinitdata indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1}; static int indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};
module_param_array(port, ulong, NULL, S_IRUGO); module_param_array(port, ulong, NULL, S_IRUGO);
MODULE_PARM_DESC(port, "I/O port number"); MODULE_PARM_DESC(port, "I/O port number");
...@@ -117,7 +117,7 @@ static void sja1000_isa_port_write_reg_indirect(const struct sja1000_priv *priv, ...@@ -117,7 +117,7 @@ static void sja1000_isa_port_write_reg_indirect(const struct sja1000_priv *priv,
outb(val, base + 1); outb(val, base + 1);
} }
static int __devinit sja1000_isa_probe(struct platform_device *pdev) static int sja1000_isa_probe(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
struct sja1000_priv *priv; struct sja1000_priv *priv;
...@@ -223,7 +223,7 @@ static int __devinit sja1000_isa_probe(struct platform_device *pdev) ...@@ -223,7 +223,7 @@ static int __devinit sja1000_isa_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit sja1000_isa_remove(struct platform_device *pdev) static int sja1000_isa_remove(struct platform_device *pdev)
{ {
struct net_device *dev = dev_get_drvdata(&pdev->dev); struct net_device *dev = dev_get_drvdata(&pdev->dev);
struct sja1000_priv *priv = netdev_priv(dev); struct sja1000_priv *priv = netdev_priv(dev);
...@@ -248,7 +248,7 @@ static int __devexit sja1000_isa_remove(struct platform_device *pdev) ...@@ -248,7 +248,7 @@ static int __devexit sja1000_isa_remove(struct platform_device *pdev)
static struct platform_driver sja1000_isa_driver = { static struct platform_driver sja1000_isa_driver = {
.probe = sja1000_isa_probe, .probe = sja1000_isa_probe,
.remove = __devexit_p(sja1000_isa_remove), .remove = sja1000_isa_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/net/can/sja1000/sja1000_of_platform.c
View file @ 3c8ac0f2
...@@ -70,7 +70,7 @@ static void sja1000_ofp_write_reg(const struct sja1000_priv *priv, ...@@ -70,7 +70,7 @@ static void sja1000_ofp_write_reg(const struct sja1000_priv *priv,
iowrite8(val, priv->reg_base + reg); iowrite8(val, priv->reg_base + reg);
} }
static int __devexit sja1000_ofp_remove(struct platform_device *ofdev) static int sja1000_ofp_remove(struct platform_device *ofdev)
{ {
struct net_device *dev = dev_get_drvdata(&ofdev->dev); struct net_device *dev = dev_get_drvdata(&ofdev->dev);
struct sja1000_priv *priv = netdev_priv(dev); struct sja1000_priv *priv = netdev_priv(dev);
...@@ -90,7 +90,7 @@ static int __devexit sja1000_ofp_remove(struct platform_device *ofdev) ...@@ -90,7 +90,7 @@ static int __devexit sja1000_ofp_remove(struct platform_device *ofdev)
return 0; return 0;
} }
static int __devinit sja1000_ofp_probe(struct platform_device *ofdev) static int sja1000_ofp_probe(struct platform_device *ofdev)
{ {
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
struct net_device *dev; struct net_device *dev;
...@@ -206,7 +206,7 @@ static int __devinit sja1000_ofp_probe(struct platform_device *ofdev) ...@@ -206,7 +206,7 @@ static int __devinit sja1000_ofp_probe(struct platform_device *ofdev)
return err; return err;
} }
static struct of_device_id __devinitdata sja1000_ofp_table[] = { static struct of_device_id sja1000_ofp_table[] = {
{.compatible = "nxp,sja1000"}, {.compatible = "nxp,sja1000"},
{}, {},
}; };
...@@ -219,7 +219,7 @@ static struct platform_driver sja1000_ofp_driver = { ...@@ -219,7 +219,7 @@ static struct platform_driver sja1000_ofp_driver = {
.of_match_table = sja1000_ofp_table, .of_match_table = sja1000_ofp_table,
}, },
.probe = sja1000_ofp_probe, .probe = sja1000_ofp_probe,
.remove = __devexit_p(sja1000_ofp_remove), .remove = sja1000_ofp_remove,
}; };
module_platform_driver(sja1000_ofp_driver); module_platform_driver(sja1000_ofp_driver);
drivers/net/can/sja1000/tscan1.c
View file @ 3c8ac0f2
...@@ -71,7 +71,7 @@ MODULE_LICENSE("GPL"); ...@@ -71,7 +71,7 @@ MODULE_LICENSE("GPL");
#define TSCAN1_SJA1000_XTAL 16000000 #define TSCAN1_SJA1000_XTAL 16000000
/* SJA1000 IO base addresses */ /* SJA1000 IO base addresses */
static const unsigned short tscan1_sja1000_addresses[] __devinitconst = { static const unsigned short tscan1_sja1000_addresses[] = {
0x100, 0x120, 0x180, 0x1a0, 0x200, 0x240, 0x280, 0x320 0x100, 0x120, 0x180, 0x1a0, 0x200, 0x240, 0x280, 0x320
}; };
...@@ -88,7 +88,7 @@ static void tscan1_write(const struct sja1000_priv *priv, int reg, u8 val) ...@@ -88,7 +88,7 @@ static void tscan1_write(const struct sja1000_priv *priv, int reg, u8 val)
} }
/* Probe for a TS-CAN1 board with JP2:JP1 jumper setting ID */ /* Probe for a TS-CAN1 board with JP2:JP1 jumper setting ID */
static int __devinit tscan1_probe(struct device *dev, unsigned id) static int tscan1_probe(struct device *dev, unsigned id)
{ {
struct net_device *netdev; struct net_device *netdev;
struct sja1000_priv *priv; struct sja1000_priv *priv;
...@@ -171,7 +171,7 @@ static int __devinit tscan1_probe(struct device *dev, unsigned id) ...@@ -171,7 +171,7 @@ static int __devinit tscan1_probe(struct device *dev, unsigned id)
return -ENXIO; return -ENXIO;
} }
static int __devexit tscan1_remove(struct device *dev, unsigned id /*unused*/) static int tscan1_remove(struct device *dev, unsigned id /*unused*/)
{ {
struct net_device *netdev; struct net_device *netdev;
struct sja1000_priv *priv; struct sja1000_priv *priv;
...@@ -197,7 +197,7 @@ static int __devexit tscan1_remove(struct device *dev, unsigned id /*unused*/) ...@@ -197,7 +197,7 @@ static int __devexit tscan1_remove(struct device *dev, unsigned id /*unused*/)
static struct isa_driver tscan1_isa_driver = { static struct isa_driver tscan1_isa_driver = {
.probe = tscan1_probe, .probe = tscan1_probe,
.remove = __devexit_p(tscan1_remove), .remove = tscan1_remove,
.driver = { .driver = {
.name = "tscan1", .name = "tscan1",
}, },
......
drivers/net/can/softing/softing_cs.c
View file @ 3c8ac0f2
...@@ -159,7 +159,7 @@ MODULE_FIRMWARE(fw_dir "bcard2.bin"); ...@@ -159,7 +159,7 @@ MODULE_FIRMWARE(fw_dir "bcard2.bin");
MODULE_FIRMWARE(fw_dir "ldcard2.bin"); MODULE_FIRMWARE(fw_dir "ldcard2.bin");
MODULE_FIRMWARE(fw_dir "cancrd2.bin"); MODULE_FIRMWARE(fw_dir "cancrd2.bin");
static __devinit const struct softing_platform_data static const struct softing_platform_data
*softingcs_find_platform_data(unsigned int manf, unsigned int prod) *softingcs_find_platform_data(unsigned int manf, unsigned int prod)
{ {
const struct softing_platform_data *lp; const struct softing_platform_data *lp;
...@@ -193,7 +193,7 @@ static int softingcs_enable_irq(struct platform_device *pdev, int v) ...@@ -193,7 +193,7 @@ static int softingcs_enable_irq(struct platform_device *pdev, int v)
/* /*
* pcmcia check * pcmcia check
*/ */
static __devinit int softingcs_probe_config(struct pcmcia_device *pcmcia, static int softingcs_probe_config(struct pcmcia_device *pcmcia,
void *priv_data) void *priv_data)
{ {
struct softing_platform_data *pdat = priv_data; struct softing_platform_data *pdat = priv_data;
...@@ -215,7 +215,7 @@ static __devinit int softingcs_probe_config(struct pcmcia_device *pcmcia, ...@@ -215,7 +215,7 @@ static __devinit int softingcs_probe_config(struct pcmcia_device *pcmcia,
return pcmcia_request_window(pcmcia, pres, memspeed); return pcmcia_request_window(pcmcia, pres, memspeed);
} }
static __devexit void softingcs_remove(struct pcmcia_device *pcmcia) static void softingcs_remove(struct pcmcia_device *pcmcia)
{ {
struct platform_device *pdev = pcmcia->priv; struct platform_device *pdev = pcmcia->priv;
...@@ -235,7 +235,7 @@ static void softingcs_pdev_release(struct device *dev) ...@@ -235,7 +235,7 @@ static void softingcs_pdev_release(struct device *dev)
kfree(pdev); kfree(pdev);
} }
static __devinit int softingcs_probe(struct pcmcia_device *pcmcia) static int softingcs_probe(struct pcmcia_device *pcmcia)
{ {
int ret; int ret;
struct platform_device *pdev; struct platform_device *pdev;
...@@ -338,7 +338,7 @@ static struct pcmcia_driver softingcs_driver = { ...@@ -338,7 +338,7 @@ static struct pcmcia_driver softingcs_driver = {
.name = "softingcs", .name = "softingcs",
.id_table = softingcs_ids, .id_table = softingcs_ids,
.probe = softingcs_probe, .probe = softingcs_probe,
.remove = __devexit_p(softingcs_remove), .remove = softingcs_remove,
}; };
static int __init softingcs_start(void) static int __init softingcs_start(void)
......
drivers/net/can/softing/softing_main.c
View file @ 3c8ac0f2
...@@ -478,7 +478,7 @@ static void softing_card_shutdown(struct softing *card) ...@@ -478,7 +478,7 @@ static void softing_card_shutdown(struct softing *card)
mutex_unlock(&card->fw.lock); mutex_unlock(&card->fw.lock);
} }
static __devinit int softing_card_boot(struct softing *card) static int softing_card_boot(struct softing *card)
{ {
int ret, j; int ret, j;
static const uint8_t stream[] = { static const uint8_t stream[] = {
...@@ -645,7 +645,7 @@ static const struct can_bittiming_const softing_btr_const = { ...@@ -645,7 +645,7 @@ static const struct can_bittiming_const softing_btr_const = {
}; };
static __devinit struct net_device *softing_netdev_create(struct softing *card, static struct net_device *softing_netdev_create(struct softing *card,
uint16_t chip_id) uint16_t chip_id)
{ {
struct net_device *netdev; struct net_device *netdev;
...@@ -676,7 +676,7 @@ static __devinit struct net_device *softing_netdev_create(struct softing *card, ...@@ -676,7 +676,7 @@ static __devinit struct net_device *softing_netdev_create(struct softing *card,
return netdev; return netdev;
} }
static __devinit int softing_netdev_register(struct net_device *netdev) static int softing_netdev_register(struct net_device *netdev)
{ {
int ret; int ret;
...@@ -745,7 +745,7 @@ static const struct attribute_group softing_pdev_group = { ...@@ -745,7 +745,7 @@ static const struct attribute_group softing_pdev_group = {
/* /*
* platform driver * platform driver
*/ */
static __devexit int softing_pdev_remove(struct platform_device *pdev) static int softing_pdev_remove(struct platform_device *pdev)
{ {
struct softing *card = platform_get_drvdata(pdev); struct softing *card = platform_get_drvdata(pdev);
int j; int j;
...@@ -766,7 +766,7 @@ static __devexit int softing_pdev_remove(struct platform_device *pdev) ...@@ -766,7 +766,7 @@ static __devexit int softing_pdev_remove(struct platform_device *pdev)
return 0; return 0;
} }
static __devinit int softing_pdev_probe(struct platform_device *pdev) static int softing_pdev_probe(struct platform_device *pdev)
{ {
const struct softing_platform_data *pdat = pdev->dev.platform_data; const struct softing_platform_data *pdat = pdev->dev.platform_data;
struct softing *card; struct softing *card;
...@@ -871,7 +871,7 @@ static struct platform_driver softing_driver = { ...@@ -871,7 +871,7 @@ static struct platform_driver softing_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = softing_pdev_probe, .probe = softing_pdev_probe,
.remove = __devexit_p(softing_pdev_remove), .remove = softing_pdev_remove,
}; };
module_platform_driver(softing_driver); module_platform_driver(softing_driver);
......
drivers/net/can/ti_hecc.c
View file @ 3c8ac0f2
...@@ -978,7 +978,7 @@ static int ti_hecc_probe(struct platform_device *pdev) ...@@ -978,7 +978,7 @@ static int ti_hecc_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit ti_hecc_remove(struct platform_device *pdev) static int ti_hecc_remove(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
...@@ -1045,7 +1045,7 @@ static struct platform_driver ti_hecc_driver = { ...@@ -1045,7 +1045,7 @@ static struct platform_driver ti_hecc_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ti_hecc_probe, .probe = ti_hecc_probe,
.remove = __devexit_p(ti_hecc_remove), .remove = ti_hecc_remove,
.suspend = ti_hecc_suspend, .suspend = ti_hecc_suspend,
.resume = ti_hecc_resume, .resume = ti_hecc_resume,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7