diff options
Diffstat (limited to 'drivers/atm/iphase.c')
-rw-r--r-- | drivers/atm/iphase.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 96cce6d53195..4217f29a85e0 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
@@ -2299,7 +2299,7 @@ static int reset_sar(struct atm_dev *dev) | |||
2299 | } | 2299 | } |
2300 | 2300 | ||
2301 | 2301 | ||
2302 | static int __devinit ia_init(struct atm_dev *dev) | 2302 | static int ia_init(struct atm_dev *dev) |
2303 | { | 2303 | { |
2304 | IADEV *iadev; | 2304 | IADEV *iadev; |
2305 | unsigned long real_base; | 2305 | unsigned long real_base; |
@@ -2492,7 +2492,7 @@ static void ia_free_rx(IADEV *iadev) | |||
2492 | iadev->rx_dle_dma); | 2492 | iadev->rx_dle_dma); |
2493 | } | 2493 | } |
2494 | 2494 | ||
2495 | static int __devinit ia_start(struct atm_dev *dev) | 2495 | static int ia_start(struct atm_dev *dev) |
2496 | { | 2496 | { |
2497 | IADEV *iadev; | 2497 | IADEV *iadev; |
2498 | int error; | 2498 | int error; |
@@ -3168,8 +3168,7 @@ static const struct atmdev_ops ops = { | |||
3168 | .owner = THIS_MODULE, | 3168 | .owner = THIS_MODULE, |
3169 | }; | 3169 | }; |
3170 | 3170 | ||
3171 | static int __devinit ia_init_one(struct pci_dev *pdev, | 3171 | static int ia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
3172 | const struct pci_device_id *ent) | ||
3173 | { | 3172 | { |
3174 | struct atm_dev *dev; | 3173 | struct atm_dev *dev; |
3175 | IADEV *iadev; | 3174 | IADEV *iadev; |
@@ -3229,7 +3228,7 @@ err_out: | |||
3229 | return ret; | 3228 | return ret; |
3230 | } | 3229 | } |
3231 | 3230 | ||
3232 | static void __devexit ia_remove_one(struct pci_dev *pdev) | 3231 | static void ia_remove_one(struct pci_dev *pdev) |
3233 | { | 3232 | { |
3234 | struct atm_dev *dev = pci_get_drvdata(pdev); | 3233 | struct atm_dev *dev = pci_get_drvdata(pdev); |
3235 | IADEV *iadev = INPH_IA_DEV(dev); | 3234 | IADEV *iadev = INPH_IA_DEV(dev); |
@@ -3270,7 +3269,7 @@ static struct pci_driver ia_driver = { | |||
3270 | .name = DEV_LABEL, | 3269 | .name = DEV_LABEL, |
3271 | .id_table = ia_pci_tbl, | 3270 | .id_table = ia_pci_tbl, |
3272 | .probe = ia_init_one, | 3271 | .probe = ia_init_one, |
3273 | .remove = __devexit_p(ia_remove_one), | 3272 | .remove = ia_remove_one, |
3274 | }; | 3273 | }; |
3275 | 3274 | ||
3276 | static int __init ia_module_init(void) | 3275 | static int __init ia_module_init(void) |