projects / packages / vpb-driver.git / blame
| Commit | Line | Data |
|---|---|---|
| ee8d576b JR |
1 | --- vpb-driver-4.2.56/src/vtcore/vtopenpci.c~ 2013-04-11 19:11:39.000000000 +0200 |
| 2 | +++ vpb-driver-4.2.56/src/vtcore/vtopenpci.c 2013-06-05 22:56:18.849529470 +0200 | |
| 3 | @@ -262,13 +262,13 @@ | |
| 4 | return (const char*)ent->driver_data; | |
| 5 | } | |
| 6 | ||
| 7 | -static int __devinit openpci_probe_board(struct pci_dev *pdev, const struct pci_device_id *ent); | |
| 8 | -static void __devexit openpci_remove_board(struct pci_dev *pdev); | |
| 9 | +static int openpci_probe_board(struct pci_dev *pdev, const struct pci_device_id *ent); | |
| 10 | +static void openpci_remove_board(struct pci_dev *pdev); | |
| 11 | ||
| 12 | static struct pci_driver vtopenpci_driver = { | |
| 13 | .name = NAME, | |
| 14 | .probe = openpci_probe_board, | |
| 15 | - .remove = __devexit_p(openpci_remove_board), | |
| 16 | + .remove = openpci_remove_board, | |
| 17 | .suspend = NULL, | |
| 18 | .resume = NULL, | |
| 19 | .id_table = openpci_idtable | |
| 20 | @@ -2327,7 +2327,7 @@ | |
| 21 | vt_board_unregister(board); | |
| 22 | } //}}} | |
| 23 | ||
| 24 | -static int __devinit openpci_probe_board(struct pci_dev *pdev, | |
| 25 | +static int openpci_probe_board(struct pci_dev *pdev, | |
| 26 | const struct pci_device_id *ent) | |
| 27 | { //{{{ | |
| 28 | struct openpci *card; | |
| 29 | @@ -2562,7 +2562,7 @@ | |
| 30 | } | |
| 31 | } //}}} | |
| 32 | ||
| 33 | -static void __devexit openpci_remove_board(struct pci_dev *pdev) | |
| 34 | +static void openpci_remove_board(struct pci_dev *pdev) | |
| 35 | { //{{{ | |
| 36 | struct openpci *card = pci_get_drvdata(pdev); | |
| 37 | unsigned long flags; | |
| 38 | --- vpb-driver-4.2.56/src/vtcore/vtopenswitch.c~ 2013-04-11 19:11:39.000000000 +0200 | |
| 39 | +++ vpb-driver-4.2.56/src/vtcore/vtopenswitch.c 2013-06-05 22:56:45.936416073 +0200 | |
| 40 | @@ -273,14 +273,14 @@ | |
| 41 | }; | |
| 42 | MODULE_DEVICE_TABLE(pci, openswitch_idtable); | |
| 43 | ||
| 44 | -static int __devinit openswitch_probe_board(struct pci_dev *pdev, | |
| 45 | +static int openswitch_probe_board(struct pci_dev *pdev, | |
| 46 | const struct pci_device_id *ent); | |
| 47 | -static void __devexit openswitch_remove_board(struct pci_dev *pdev); | |
| 48 | +static void openswitch_remove_board(struct pci_dev *pdev); | |
| 49 | ||
| 50 | static struct pci_driver vtopenswitch_driver = { | |
| 51 | .name = NAME, | |
| 52 | .probe = openswitch_probe_board, | |
| 53 | - .remove = __devexit_p(openswitch_remove_board), | |
| 54 | + .remove = openswitch_remove_board, | |
| 55 | .suspend = NULL, | |
| 56 | .resume = NULL, | |
| 57 | .id_table = openswitch_idtable | |
| 58 | @@ -1582,7 +1582,7 @@ | |
| 59 | return RET_OK; | |
| 60 | } //}}} | |
| 61 | ||
| 62 | -static int __devinit openswitch_probe_board(struct pci_dev *pdev, | |
| 63 | +static int openswitch_probe_board(struct pci_dev *pdev, | |
| 64 | const struct pci_device_id *ent) | |
| 65 | { //{{{ | |
| 66 | struct openswitch *card; | |
| 67 | @@ -1858,7 +1858,7 @@ | |
| 68 | set_audio_off( card, port ); | |
| 69 | } //}}} | |
| 70 | ||
| 71 | -static void __devexit openswitch_remove_board(struct pci_dev *pdev) | |
| 72 | +static void openswitch_remove_board(struct pci_dev *pdev) | |
| 73 | { //{{{ | |
| 74 | struct openswitch *card = pci_get_drvdata(pdev); | |
| 75 | int i = 0; |