Drivers: atm: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed. This change removes the use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit from these drivers. Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand. Cc: Bill Pemberton <wfp5p@virginia.edu> Cc: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -1567,7 +1567,7 @@ tx_complete++;
|
||||
/*--------------------------------- entries ---------------------------------*/
|
||||
|
||||
|
||||
static char * const media_name[] __devinitconst = {
|
||||
static char * const media_name[] = {
|
||||
"MMF", "SMF", "MMF", "03?", /* 0- 3 */
|
||||
"UTP", "05?", "06?", "07?", /* 4- 7 */
|
||||
"TAXI","09?", "10?", "11?", /* 8-11 */
|
||||
@@ -1591,7 +1591,7 @@ static char * const media_name[] __devinitconst = {
|
||||
} })
|
||||
|
||||
|
||||
static int __devinit get_esi_asic(struct atm_dev *dev)
|
||||
static int get_esi_asic(struct atm_dev *dev)
|
||||
{
|
||||
struct eni_dev *eni_dev;
|
||||
unsigned char tonga;
|
||||
@@ -1683,7 +1683,7 @@ static int __devinit get_esi_asic(struct atm_dev *dev)
|
||||
#undef GET_SEPROM
|
||||
|
||||
|
||||
static int __devinit get_esi_fpga(struct atm_dev *dev, void __iomem *base)
|
||||
static int get_esi_fpga(struct atm_dev *dev, void __iomem *base)
|
||||
{
|
||||
void __iomem *mac_base;
|
||||
int i;
|
||||
@@ -1694,7 +1694,7 @@ static int __devinit get_esi_fpga(struct atm_dev *dev, void __iomem *base)
|
||||
}
|
||||
|
||||
|
||||
static int __devinit eni_do_init(struct atm_dev *dev)
|
||||
static int eni_do_init(struct atm_dev *dev)
|
||||
{
|
||||
struct midway_eprom __iomem *eprom;
|
||||
struct eni_dev *eni_dev;
|
||||
@@ -1797,7 +1797,7 @@ static void eni_do_release(struct atm_dev *dev)
|
||||
iounmap(ed->ioaddr);
|
||||
}
|
||||
|
||||
static int __devinit eni_start(struct atm_dev *dev)
|
||||
static int eni_start(struct atm_dev *dev)
|
||||
{
|
||||
struct eni_dev *eni_dev;
|
||||
|
||||
@@ -2226,8 +2226,8 @@ static const struct atmdev_ops ops = {
|
||||
};
|
||||
|
||||
|
||||
static int __devinit eni_init_one(struct pci_dev *pci_dev,
|
||||
const struct pci_device_id *ent)
|
||||
static int eni_init_one(struct pci_dev *pci_dev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
struct atm_dev *dev;
|
||||
struct eni_dev *eni_dev;
|
||||
@@ -2292,7 +2292,7 @@ static struct pci_device_id eni_pci_tbl[] = {
|
||||
MODULE_DEVICE_TABLE(pci,eni_pci_tbl);
|
||||
|
||||
|
||||
static void __devexit eni_remove_one(struct pci_dev *pdev)
|
||||
static void eni_remove_one(struct pci_dev *pdev)
|
||||
{
|
||||
struct atm_dev *dev = pci_get_drvdata(pdev);
|
||||
struct eni_dev *ed = ENI_DEV(dev);
|
||||
@@ -2310,7 +2310,7 @@ static struct pci_driver eni_driver = {
|
||||
.name = DEV_LABEL,
|
||||
.id_table = eni_pci_tbl,
|
||||
.probe = eni_init_one,
|
||||
.remove = __devexit_p(eni_remove_one),
|
||||
.remove = eni_remove_one,
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user