summaryrefslogtreecommitdiff
path: root/target/linux/generic/files/crypto/ocf
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-27 17:48:48 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-27 17:48:48 +0000
commit91ba1524d4179b776ff3ae90c22a37eb26827833 (patch)
treeae7fa0b910db3b6d227aa0cf2a254a59fd40d8d6 /target/linux/generic/files/crypto/ocf
parent54d47826560af1347881eb46a6fa1152e937d1b8 (diff)
kernel: remove __devinit, __devexit and __devexit_p for kernel 3.8
These attributes where removed with kernel 3.8 and are now causing compile errors. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35328 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/files/crypto/ocf')
-rw-r--r--target/linux/generic/files/crypto/ocf/pasemi/pasemi.c8
-rw-r--r--target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c12
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c b/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c
index 1b4333cdde..7bb62bc531 100644
--- a/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c
+++ b/target/linux/generic/files/crypto/ocf/pasemi/pasemi.c
@@ -38,7 +38,7 @@
#define TIMER_INTERVAL 1000
-static void __devexit pasemi_dma_remove(struct pci_dev *pdev);
+static void pasemi_dma_remove(struct pci_dev *pdev);
static struct pasdma_status volatile * dma_status;
static int debug;
@@ -790,7 +790,7 @@ static device_method_t pasemi_methods = {
/* Set up the crypto device structure, private data,
* and anything else we need before we start */
-static int __devinit
+static int
pasemi_dma_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
struct pasemi_softc *sc;
@@ -943,7 +943,7 @@ static void pasemi_free_tx_resources(struct pasemi_softc *sc, int chan)
del_timer(&ring->crypto_timer);
}
-static void __devexit pasemi_dma_remove(struct pci_dev *pdev)
+static void pasemi_dma_remove(struct pci_dev *pdev)
{
struct pasemi_softc *sc = pci_get_drvdata(pdev);
int i;
@@ -984,7 +984,7 @@ static struct pci_driver pasemi_dma_driver = {
.name = "pasemi_dma",
.id_table = pasemi_dma_pci_tbl,
.probe = pasemi_dma_probe,
- .remove = __devexit_p(pasemi_dma_remove),
+ .remove = pasemi_dma_remove,
};
static void __exit pasemi_dma_cleanup_module(void)
diff --git a/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c b/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c
index f5d7762360..3f3f5135cd 100644
--- a/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c
+++ b/target/linux/generic/files/crypto/ocf/ubsec_ssb/ubsec_ssb.c
@@ -104,9 +104,9 @@
* Prototypes
*/
static irqreturn_t ubsec_ssb_isr(int, void *, struct pt_regs *);
-static int __devinit ubsec_ssb_probe(struct ssb_device *sdev,
+static int ubsec_ssb_probe(struct ssb_device *sdev,
const struct ssb_device_id *ent);
-static void __devexit ubsec_ssb_remove(struct ssb_device *sdev);
+static void ubsec_ssb_remove(struct ssb_device *sdev);
int ubsec_attach(struct ssb_device *sdev, const struct ssb_device_id *ent,
struct device *self);
static void ubsec_setup_mackey(struct ubsec_session *ses, int algo,
@@ -185,7 +185,7 @@ static struct ssb_driver ubsec_ssb_driver = {
.name = DRV_MODULE_NAME,
.id_table = ubsec_ssb_tbl,
.probe = ubsec_ssb_probe,
- .remove = __devexit_p(ubsec_ssb_remove),
+ .remove = ubsec_ssb_remove,
/*
.suspend = ubsec_ssb_suspend,
.resume = ubsec_ssb_resume
@@ -482,8 +482,8 @@ ubsec_setup_mackey(struct ubsec_session *ses, int algo, caddr_t key, int klen)
}
#undef N
-static int
-__devinit ubsec_ssb_probe(struct ssb_device *sdev,
+static int
+ubsec_ssb_probe(struct ssb_device *sdev,
const struct ssb_device_id *ent)
{
int err;
@@ -553,7 +553,7 @@ err_out:
return err;
}
-static void __devexit ubsec_ssb_remove(struct ssb_device *sdev) {
+static void ubsec_ssb_remove(struct ssb_device *sdev) {
struct ubsec_softc *sc;
unsigned int ctrlflgs;