starfire: 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: Ion Badulescu <ionut@badula.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
083abbb7dc
Коммит
d3ace588d8
|
@ -166,7 +166,7 @@ static int rx_copybreak /* = 0 */;
|
|||
#define FIRMWARE_TX "adaptec/starfire_tx.bin"
|
||||
|
||||
/* These identify the driver base version and may not be removed. */
|
||||
static const char version[] __devinitconst =
|
||||
static const char version[] =
|
||||
KERN_INFO "starfire.c:v1.03 7/26/2000 Written by Donald Becker <becker@scyld.com>\n"
|
||||
" (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n";
|
||||
|
||||
|
@ -295,7 +295,7 @@ MODULE_DEVICE_TABLE(pci, starfire_pci_tbl);
|
|||
static const struct chip_info {
|
||||
const char *name;
|
||||
int drv_flags;
|
||||
} netdrv_tbl[] __devinitconst = {
|
||||
} netdrv_tbl[] = {
|
||||
{ "Adaptec Starfire 6915", CanHaveMII },
|
||||
};
|
||||
|
||||
|
@ -641,7 +641,7 @@ static const struct net_device_ops netdev_ops = {
|
|||
#endif
|
||||
};
|
||||
|
||||
static int __devinit starfire_init_one(struct pci_dev *pdev,
|
||||
static int starfire_init_one(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
struct device *d = &pdev->dev;
|
||||
|
@ -1990,7 +1990,7 @@ static int starfire_resume(struct pci_dev *pdev)
|
|||
#endif /* CONFIG_PM */
|
||||
|
||||
|
||||
static void __devexit starfire_remove_one (struct pci_dev *pdev)
|
||||
static void starfire_remove_one(struct pci_dev *pdev)
|
||||
{
|
||||
struct net_device *dev = pci_get_drvdata(pdev);
|
||||
struct netdev_private *np = netdev_priv(dev);
|
||||
|
@ -2018,7 +2018,7 @@ static void __devexit starfire_remove_one (struct pci_dev *pdev)
|
|||
static struct pci_driver starfire_driver = {
|
||||
.name = DRV_NAME,
|
||||
.probe = starfire_init_one,
|
||||
.remove = __devexit_p(starfire_remove_one),
|
||||
.remove = starfire_remove_one,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = starfire_suspend,
|
||||
.resume = starfire_resume,
|
||||
|
|
Загрузка…
Ссылка в новой задаче