GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 07:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drivers: network: more __dev* removal

Browse source 
Remove some __dev* markings that snuck in the 3.8-rc1 merge window in
the drivers/net/* directory.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Greg KH 2012-12-21 13:42:15 +00:00 • committed by David S. Miller
parent 9b1536c490
commit 03ce758e56
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/ethernet/marvell/mvmdio.c
View file

@ -141,7 +141,7 @@ static int orion_mdio_reset(struct mii_bus *bus)
return 0; return 0;
} }
static int __devinit orion_mdio_probe(struct platform_device *pdev) static int orion_mdio_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct mii_bus *bus; struct mii_bus *bus;
@ -197,7 +197,7 @@ static int __devinit orion_mdio_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit orion_mdio_remove(struct platform_device *pdev) static int orion_mdio_remove(struct platform_device *pdev)
{ {
struct mii_bus *bus = platform_get_drvdata(pdev); struct mii_bus *bus = platform_get_drvdata(pdev);
mdiobus_unregister(bus); mdiobus_unregister(bus);
@ -214,7 +214,7 @@ MODULE_DEVICE_TABLE(of, orion_mdio_match);
static struct platform_driver orion_mdio_driver = { static struct platform_driver orion_mdio_driver = {
.probe = orion_mdio_probe, .probe = orion_mdio_probe,
.remove = __devexit_p(orion_mdio_remove), .remove = orion_mdio_remove,
.driver = { .driver = {
.name = "orion-mdio", .name = "orion-mdio",
.of_match_table = orion_mdio_match, .of_match_table = orion_mdio_match,

19
drivers/net/ethernet/marvell/mvneta.c
View file

@ -635,7 +635,7 @@ static void mvneta_rxq_bm_disable(struct mvneta_port *pp,
/* Sets the RGMII Enable bit (RGMIIEn) in port MAC control register */ /* Sets the RGMII Enable bit (RGMIIEn) in port MAC control register */
static void __devinit mvneta_gmac_rgmii_set(struct mvneta_port *pp, int enable) static void mvneta_gmac_rgmii_set(struct mvneta_port *pp, int enable)
{ {
u32 val; u32 val;
@ -650,7 +650,7 @@ static void __devinit mvneta_gmac_rgmii_set(struct mvneta_port *pp, int enable)
} }
/* Config SGMII port */ /* Config SGMII port */
static void __devinit mvneta_port_sgmii_config(struct mvneta_port *pp) static void mvneta_port_sgmii_config(struct mvneta_port *pp)
{ {
u32 val; u32 val;
@ -2564,7 +2564,7 @@ const struct ethtool_ops mvneta_eth_tool_ops = {
}; };
/* Initialize hw */ /* Initialize hw */
static int __devinit mvneta_init(struct mvneta_port *pp, int phy_addr) static int mvneta_init(struct mvneta_port *pp, int phy_addr)
{ {
int queue; int queue;
@ -2613,9 +2613,8 @@ static void mvneta_deinit(struct mvneta_port *pp)
} }
/* platform glue : initialize decoding windows */ /* platform glue : initialize decoding windows */
static void __devinit static void mvneta_conf_mbus_windows(struct mvneta_port *pp,
mvneta_conf_mbus_windows(struct mvneta_port *pp, const struct mbus_dram_target_info *dram)
const struct mbus_dram_target_info *dram)
{ {
u32 win_enable; u32 win_enable;
u32 win_protect; u32 win_protect;
@ -2648,7 +2647,7 @@ mvneta_conf_mbus_windows(struct mvneta_port *pp,
} }
/* Power up the port */ /* Power up the port */
static void __devinit mvneta_port_power_up(struct mvneta_port *pp, int phy_mode) static void mvneta_port_power_up(struct mvneta_port *pp, int phy_mode)
{ {
u32 val; u32 val;
@ -2671,7 +2670,7 @@ static void __devinit mvneta_port_power_up(struct mvneta_port *pp, int phy_mode)
} }
/* Device initialization routine */ /* Device initialization routine */
static int __devinit mvneta_probe(struct platform_device *pdev) static int mvneta_probe(struct platform_device *pdev)
{ {
const struct mbus_dram_target_info *dram_target_info; const struct mbus_dram_target_info *dram_target_info;
struct device_node *dn = pdev->dev.of_node; struct device_node *dn = pdev->dev.of_node;
@ -2803,7 +2802,7 @@ err_free_netdev:
} }
/* Device removal routine */ /* Device removal routine */
static int __devexit mvneta_remove(struct platform_device *pdev) static int mvneta_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct mvneta_port *pp = netdev_priv(dev); struct mvneta_port *pp = netdev_priv(dev);
@ -2828,7 +2827,7 @@ MODULE_DEVICE_TABLE(of, mvneta_match);
static struct platform_driver mvneta_driver = { static struct platform_driver mvneta_driver = {
.probe = mvneta_probe, .probe = mvneta_probe,
.remove = __devexit_p(mvneta_remove), .remove = mvneta_remove,
.driver = { .driver = {
.name = MVNETA_DRIVER_NAME, .name = MVNETA_DRIVER_NAME,
.of_match_table = mvneta_match, .of_match_table = mvneta_match,

2
drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
View file

@ -341,7 +341,7 @@ static struct rtl_hal_cfg rtl8723ae_hal_cfg = {
.maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15, .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,
}; };
static struct pci_device_id rtl8723ae_pci_ids[] __devinitdata = { static struct pci_device_id rtl8723ae_pci_ids[] = {
{RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8723, rtl8723ae_hal_cfg)}, {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8723, rtl8723ae_hal_cfg)},
{}, {},
}; };