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:
@@ -1789,7 +1789,7 @@ static void CLOCK_IT (const hrz_dev *dev, u32 ctrl)
|
||||
WRITE_IT_WAIT(dev, ctrl | SEEPROM_SK);
|
||||
}
|
||||
|
||||
static u16 __devinit read_bia (const hrz_dev * dev, u16 addr)
|
||||
static u16 read_bia(const hrz_dev *dev, u16 addr)
|
||||
{
|
||||
u32 ctrl = rd_regl (dev, CONTROL_0_REG);
|
||||
|
||||
@@ -1845,7 +1845,8 @@ static u16 __devinit read_bia (const hrz_dev * dev, u16 addr)
|
||||
|
||||
/********** initialise a card **********/
|
||||
|
||||
static int __devinit hrz_init (hrz_dev * dev) {
|
||||
static int hrz_init(hrz_dev *dev)
|
||||
{
|
||||
int onefivefive;
|
||||
|
||||
u16 chan;
|
||||
@@ -2681,7 +2682,8 @@ static const struct atmdev_ops hrz_ops = {
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)
|
||||
static int hrz_probe(struct pci_dev *pci_dev,
|
||||
const struct pci_device_id *pci_ent)
|
||||
{
|
||||
hrz_dev * dev;
|
||||
int err = 0;
|
||||
@@ -2836,7 +2838,7 @@ out_disable:
|
||||
goto out;
|
||||
}
|
||||
|
||||
static void __devexit hrz_remove_one(struct pci_dev *pci_dev)
|
||||
static void hrz_remove_one(struct pci_dev *pci_dev)
|
||||
{
|
||||
hrz_dev *dev;
|
||||
|
||||
@@ -2901,7 +2903,7 @@ MODULE_DEVICE_TABLE(pci, hrz_pci_tbl);
|
||||
static struct pci_driver hrz_driver = {
|
||||
.name = "horizon",
|
||||
.probe = hrz_probe,
|
||||
.remove = __devexit_p(hrz_remove_one),
|
||||
.remove = hrz_remove_one,
|
||||
.id_table = hrz_pci_tbl,
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user