Commit 779c1a85 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

tulip: 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: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f3f9e509

drivers/net/ethernet/dec/tulip/de2104x.c

+9 −8
Original line number Diff line number Diff line
@@ -1700,7 +1700,7 @@ static const struct ethtool_ops de_ethtool_ops = { 
	.get_regs		= de_get_regs,

};



static void __devinit de21040_get_mac_address (struct de_private *de)

static void de21040_get_mac_address(struct de_private *de)

{

	unsigned i;
@@ -1721,7 +1721,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de) 
	}

}



static void __devinit de21040_get_media_info(struct de_private *de)

static void de21040_get_media_info(struct de_private *de)

{

	unsigned int i;
@@ -1748,7 +1748,8 @@ static void __devinit de21040_get_media_info(struct de_private *de) 
}



/* Note: this routine returns extra data bits for size detection. */

static unsigned __devinit tulip_read_eeprom(void __iomem *regs, int location, int addr_len)

static unsigned tulip_read_eeprom(void __iomem *regs, int location,

				  int addr_len)

{

	int i;

	unsigned retval = 0;
@@ -1783,7 +1784,7 @@ static unsigned __devinit tulip_read_eeprom(void __iomem *regs, int location, in 
	return retval;

}



static void __devinit de21041_get_srom_info (struct de_private *de)

static void de21041_get_srom_info(struct de_private *de)

{

	unsigned i, sa_offset = 0, ofs;

	u8 ee_data[DE_EEPROM_SIZE + 6] = {};
@@ -1961,7 +1962,7 @@ static const struct net_device_ops de_netdev_ops = { 
	.ndo_validate_addr	= eth_validate_addr,

};



static int __devinit de_init_one (struct pci_dev *pdev,

static int de_init_one(struct pci_dev *pdev,

		       const struct pci_device_id *ent)

{

	struct net_device *dev;
@@ -2099,7 +2100,7 @@ err_out_free: 
	return rc;

}



static void __devexit de_remove_one (struct pci_dev *pdev)

static void de_remove_one(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct de_private *de = netdev_priv(dev);
@@ -2184,7 +2185,7 @@ static struct pci_driver de_driver = { 
	.name		= DRV_NAME,

	.id_table	= de_pci_tbl,

	.probe		= de_init_one,

	.remove		= __devexit_p(de_remove_one),

	.remove		= de_remove_one,

#ifdef CONFIG_PM

	.suspend	= de_suspend,

	.resume		= de_resume,

drivers/net/ethernet/dec/tulip/de4x5.c

+9 −9
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ 


#include "de4x5.h"



static const char version[] __devinitconst =

static const char version[] =

	KERN_INFO "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n";



#define c_char const char
@@ -1092,7 +1092,7 @@ static const struct net_device_ops de4x5_netdev_ops = { 
};





static int __devinit

static int

de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)

{

    char name[DE4X5_NAME_LENGTH + 1];
@@ -2077,7 +2077,7 @@ static int __init de4x5_eisa_probe (struct device *gendev) 
	return status;

}



static int __devexit de4x5_eisa_remove (struct device *device)

static int de4x5_eisa_remove(struct device *device)

{

	struct net_device *dev;

	u_long iobase;
@@ -2104,7 +2104,7 @@ static struct eisa_driver de4x5_eisa_driver = { 
        .driver   = {

                .name    = "de4x5",

                .probe   = de4x5_eisa_probe,

                .remove  = __devexit_p (de4x5_eisa_remove),

		.remove	 = de4x5_eisa_remove,

        }

};

MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
@@ -2118,7 +2118,7 @@ MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids); 
** DECchips, we can find the base SROM irrespective of the BIOS scan direction.

** For single port cards this is a time waster...

*/

static void __devinit

static void

srom_search(struct net_device *dev, struct pci_dev *pdev)

{

    u_char pb;
@@ -2192,7 +2192,7 @@ srom_search(struct net_device *dev, struct pci_dev *pdev) 
** kernels use the V0.535[n] drivers.

*/



static int __devinit de4x5_pci_probe (struct pci_dev *pdev,

static int de4x5_pci_probe(struct pci_dev *pdev,

			   const struct pci_device_id *ent)

{

	u_char pb, pbus = 0, dev_num, dnum = 0, timer;
@@ -2314,7 +2314,7 @@ static int __devinit de4x5_pci_probe (struct pci_dev *pdev, 
	return error;

}



static void __devexit de4x5_pci_remove (struct pci_dev *pdev)

static void de4x5_pci_remove(struct pci_dev *pdev)

{

	struct net_device *dev;

	u_long iobase;
@@ -2344,7 +2344,7 @@ static struct pci_driver de4x5_pci_driver = { 
        .name           = "de4x5",

        .id_table       = de4x5_pci_tbl,

        .probe          = de4x5_pci_probe,

	.remove         = __devexit_p (de4x5_pci_remove),

	.remove         = de4x5_pci_remove,

};



#endif

drivers/net/ethernet/dec/tulip/dmfe.c

+6 −6
Original line number Diff line number Diff line
@@ -291,8 +291,8 @@ enum dmfe_CR6_bits { 
};



/* Global variable declaration ----------------------------- */

static int __devinitdata printed_version;

static const char version[] __devinitconst =

static int printed_version;

static const char version[] =

	"Davicom DM9xxx net driver, version " DRV_VERSION " (" DRV_RELDATE ")";



static int dmfe_debug;
@@ -367,7 +367,7 @@ static const struct net_device_ops netdev_ops = { 
 *	Search DM910X board ,allocate space and register it

 */



static int __devinit dmfe_init_one (struct pci_dev *pdev,

static int dmfe_init_one(struct pci_dev *pdev,

			 const struct pci_device_id *ent)

{

	struct dmfe_board_info *db;	/* board information structure */
@@ -531,7 +531,7 @@ err_out_free: 
}





static void __devexit dmfe_remove_one (struct pci_dev *pdev)

static void dmfe_remove_one(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct dmfe_board_info *db = netdev_priv(dev);
@@ -2187,7 +2187,7 @@ static struct pci_driver dmfe_driver = { 
	.name		= "dmfe",

	.id_table	= dmfe_pci_tbl,

	.probe		= dmfe_init_one,

	.remove		= __devexit_p(dmfe_remove_one),

	.remove		= dmfe_remove_one,

	.suspend        = dmfe_suspend,

	.resume         = dmfe_resume

};

drivers/net/ethernet/dec/tulip/eeprom.c

+5 −5
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
   */



/* Known cards that have old-style EEPROMs. */

static struct eeprom_fixup eeprom_fixups[] __devinitdata = {

static struct eeprom_fixup eeprom_fixups[] = {

  {"Asante", 0, 0, 0x94, {0x1e00, 0x0000, 0x0800, 0x0100, 0x018c,

			  0x0000, 0x0000, 0xe078, 0x0001, 0x0050, 0x0018 }},

  {"SMC9332DST", 0, 0, 0xC0, { 0x1e00, 0x0000, 0x0800, 0x041f,
@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = { 
  {NULL}};





static const char *const block_name[] __devinitconst = {

static const char *const block_name[] = {

	"21140 non-MII",

	"21140 MII PHY",

	"21142 Serial PHY",
@@ -102,7 +102,7 @@ static const char *const block_name[] __devinitconst = { 
 * #ifdef __hppa__ should completely optimize this function away for

 * non-parisc hardware.

 */

static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)

static void tulip_build_fake_mediatable(struct tulip_private *tp)

{

#ifdef CONFIG_GSC

	if (tp->flags & NEEDS_FAKE_MEDIA_TABLE) {
@@ -140,7 +140,7 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp) 
#endif

}



void __devinit tulip_parse_eeprom(struct net_device *dev)

void tulip_parse_eeprom(struct net_device *dev)

{

	/*

	  dev is not registered at this point, so logging messages can't
@@ -339,7 +339,7 @@ subsequent_board: 
#define EE_READ_CMD		(6)



/* Note: this routine returns extra data bits for size detection. */

int __devinit tulip_read_eeprom(struct net_device *dev, int location, int addr_len)

int tulip_read_eeprom(struct net_device *dev, int location, int addr_len)

{

	int i;

	unsigned retval = 0;

drivers/net/ethernet/dec/tulip/media.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ int tulip_check_duplex(struct net_device *dev) 
	return 0;

}



void __devinit tulip_find_mii (struct net_device *dev, int board_idx)

void tulip_find_mii(struct net_device *dev, int board_idx)

{

	struct tulip_private *tp = netdev_priv(dev);

	int phyn, phy_idx = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE