Skip to content

Commit

Permalink
Merge tag 'dev_removal' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history 
…git/gregkh/net-next

Networking:  Remove __dev* markings from the networking drivers

This is a series of patches that remove the dev* attributes for all
networking drivers, with the exception of wireless drivers, those are in
a different branch.

Use of __devinit, __devexit_p, __devinitdata, __devinitconst, and
__devexit are no longer needed since CONFIG_HOTPLUG is being removed as
an option.

Note, there are some devinit compiler section mismatch warnings due to
this series, but they are fixed up when merged with my driver-next
branch, which fixes the PCI device id warnings, and removes the modpost
detection, as it's no longer needed.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Dec 3, 2012
2 parents a5a81f0 + 9f9a12f commit 682d797
Show file tree
Hide file tree
Showing 233 changed files with 1,142 additions and 1,133 deletions.
6 changes: 3 additions & 3 deletions drivers/net/arcnet/com20020-pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ module_param(clockp, int, 0);
module_param(clockm, int, 0);
MODULE_LICENSE("GPL");

static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static int com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
struct net_device *dev;
struct arcnet_local *lp;
Expand Down Expand Up @@ -135,7 +135,7 @@ static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_de
return err;
}

static void __devexit com20020pci_remove(struct pci_dev *pdev)
static void com20020pci_remove(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
unregister_netdev(dev);
Expand Down Expand Up @@ -178,7 +178,7 @@ static struct pci_driver com20020pci_driver = {
.name = "com20020",
.id_table = com20020pci_id_table,
.probe = com20020pci_probe,
.remove = __devexit_p(com20020pci_remove),
.remove = com20020pci_remove,
};

static int __init com20020pci_init(void)
Expand Down
8 changes: 4 additions & 4 deletions drivers/net/can/at91_can.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ struct at91_priv {
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] = {
.rx_first = 1,
.rx_split = 8,
Expand Down Expand Up @@ -1242,7 +1242,7 @@ static struct attribute_group at91_sysfs_attr_group = {
.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;
enum at91_devtype devtype;
Expand Down Expand Up @@ -1339,7 +1339,7 @@ static int __devinit at91_can_probe(struct platform_device *pdev)
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 at91_priv *priv = netdev_priv(dev);
Expand Down Expand Up @@ -1376,7 +1376,7 @@ MODULE_DEVICE_TABLE(platform, at91_can_id_table);

static struct platform_driver at91_can_driver = {
.probe = at91_can_probe,
.remove = __devexit_p(at91_can_remove),
.remove = at91_can_remove,
.driver = {
.name = KBUILD_MODNAME,
.owner = THIS_MODULE,
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/can/bfin_can.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ static const struct net_device_ops bfin_can_netdev_ops = {
.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;
struct net_device *dev;
Expand Down Expand Up @@ -611,7 +611,7 @@ static int __devinit bfin_can_probe(struct platform_device *pdev)
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 bfin_can_priv *priv = netdev_priv(dev);
Expand Down Expand Up @@ -677,7 +677,7 @@ static int bfin_can_resume(struct platform_device *pdev)

static struct platform_driver bfin_can_driver = {
.probe = bfin_can_probe,
.remove = __devexit_p(bfin_can_remove),
.remove = bfin_can_remove,
.suspend = bfin_can_suspend,
.resume = bfin_can_resume,
.driver = {
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/can/c_can/c_can_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}

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)
{
struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data;
Expand Down Expand Up @@ -174,7 +174,7 @@ static int __devinit c_can_pci_probe(struct pci_dev *pdev,
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 c_can_priv *priv = netdev_priv(dev);
Expand Down Expand Up @@ -210,7 +210,7 @@ static struct pci_driver c_can_pci_driver = {
.name = KBUILD_MODNAME,
.id_table = c_can_pci_tbl,
.probe = c_can_pci_probe,
.remove = __devexit_p(c_can_pci_remove),
.remove = c_can_pci_remove,
};

module_pci_driver(c_can_pci_driver);
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/can/c_can/c_can_platform.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static const struct of_device_id 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;
void __iomem *addr;
Expand Down Expand Up @@ -248,7 +248,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
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 c_can_priv *priv = netdev_priv(dev);
Expand Down Expand Up @@ -334,7 +334,7 @@ static struct platform_driver c_can_plat_driver = {
.of_match_table = of_match_ptr(c_can_of_table),
},
.probe = c_can_plat_probe,
.remove = __devexit_p(c_can_plat_remove),
.remove = c_can_plat_remove,
.suspend = c_can_suspend,
.resume = c_can_resume,
.id_table = c_can_id_table,
Expand Down
18 changes: 9 additions & 9 deletions drivers/net/can/cc770/cc770_isa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ MODULE_LICENSE("GPL v2");

static unsigned long port[MAXDEV];
static unsigned long mem[MAXDEV];
static int __devinitdata irq[MAXDEV];
static int __devinitdata clk[MAXDEV];
static u8 __devinitdata cir[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static u8 __devinitdata cor[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static u8 __devinitdata bcr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static int __devinitdata indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};
static int irq[MAXDEV];
static int clk[MAXDEV];
static u8 cir[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static u8 cor[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static u8 bcr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static int indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};

module_param_array(port, ulong, NULL, S_IRUGO);
MODULE_PARM_DESC(port, "I/O port number");
Expand Down Expand Up @@ -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);
}

static int __devinit cc770_isa_probe(struct platform_device *pdev)
static int cc770_isa_probe(struct platform_device *pdev)
{
struct net_device *dev;
struct cc770_priv *priv;
Expand Down Expand Up @@ -291,7 +291,7 @@ static int __devinit cc770_isa_probe(struct platform_device *pdev)
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 cc770_priv *priv = netdev_priv(dev);
Expand All @@ -316,7 +316,7 @@ static int __devexit cc770_isa_remove(struct platform_device *pdev)

static struct platform_driver cc770_isa_driver = {
.probe = cc770_isa_probe,
.remove = __devexit_p(cc770_isa_remove),
.remove = cc770_isa_remove,
.driver = {
.name = KBUILD_MODNAME,
.owner = THIS_MODULE,
Expand Down
12 changes: 6 additions & 6 deletions drivers/net/can/cc770/cc770_platform.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static void cc770_platform_write_reg(const struct cc770_priv *priv, int 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 device_node *np = pdev->dev.of_node;
Expand Down Expand Up @@ -148,7 +148,7 @@ static int __devinit cc770_get_of_node_data(struct platform_device *pdev,
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)
{

Expand All @@ -164,7 +164,7 @@ static int __devinit cc770_get_platform_data(struct platform_device *pdev,
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 cc770_priv *priv;
Expand Down Expand Up @@ -238,7 +238,7 @@ static int __devinit cc770_platform_probe(struct platform_device *pdev)
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 cc770_priv *priv = netdev_priv(dev);
Expand All @@ -254,7 +254,7 @@ static int __devexit cc770_platform_remove(struct platform_device *pdev)
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 = "intc,82527"}, /* AN82527 from Intel CP */
{},
Expand All @@ -268,7 +268,7 @@ static struct platform_driver cc770_platform_driver = {
.of_match_table = cc770_platform_table,
},
.probe = cc770_platform_probe,
.remove = __devexit_p(cc770_platform_remove),
.remove = cc770_platform_remove,
};

module_platform_driver(cc770_platform_driver);
10 changes: 5 additions & 5 deletions drivers/net/can/flexcan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ static const struct net_device_ops flexcan_netdev_ops = {
.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_regs __iomem *regs = priv->base;
Expand Down Expand Up @@ -968,7 +968,7 @@ static int __devinit register_flexcandev(struct net_device *dev)
return err;
}

static void __devexit unregister_flexcandev(struct net_device *dev)
static void unregister_flexcandev(struct net_device *dev)
{
unregister_candev(dev);
}
Expand All @@ -987,7 +987,7 @@ static const struct platform_device_id 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 flexcan_devtype_data *devtype_data;
Expand Down Expand Up @@ -1109,7 +1109,7 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
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 flexcan_priv *priv = netdev_priv(dev);
Expand Down Expand Up @@ -1170,7 +1170,7 @@ static struct platform_driver flexcan_driver = {
.of_match_table = flexcan_of_match,
},
.probe = flexcan_probe,
.remove = __devexit_p(flexcan_remove),
.remove = flexcan_remove,
.suspend = flexcan_suspend,
.resume = flexcan_resume,
.id_table = flexcan_id_table,
Expand Down
8 changes: 4 additions & 4 deletions drivers/net/can/grcan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1659,7 +1659,7 @@ static int grcan_setup_netdev(struct platform_device *ofdev,
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 resource *res;
Expand Down Expand Up @@ -1714,7 +1714,7 @@ static int __devinit grcan_probe(struct platform_device *ofdev)
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 grcan_priv *priv = netdev_priv(dev);
Expand All @@ -1729,7 +1729,7 @@ static int __devexit grcan_remove(struct platform_device *ofdev)
return 0;
}

static struct of_device_id grcan_match[] __devinitconst = {
static struct of_device_id grcan_match[] = {
{.name = "GAISLER_GRCAN"},
{.name = "01_03d"},
{.name = "GAISLER_GRHCAN"},
Expand All @@ -1746,7 +1746,7 @@ static struct platform_driver grcan_driver = {
.of_match_table = grcan_match,
},
.probe = grcan_probe,
.remove = __devexit_p(grcan_remove),
.remove = grcan_remove,
};

module_platform_driver(grcan_driver);
Expand Down
Loading

0 comments on commit 682d797

Please sign in to comment.