From a58331370666fb1aceb80d2d1173ab52e0ed0813 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:56:35 -0500 Subject: [PATCH] --- yaml --- r: 342019 b: refs/heads/master c: fbdb7fcefe95cb77b9d692e6f9c7c02ecc846c10 h: refs/heads/master i: 342017: 830887fc9df821341ed80c46c2b6200e813b1b63 342015: d27ce33b6962658a80a9161d58b87cc34fcec5e5 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/if_spi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 531ff7478b0a..2bac34093278 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d00064d4f775150017835f2c93905f05691e1649 +refs/heads/master: fbdb7fcefe95cb77b9d692e6f9c7c02ecc846c10 diff --git a/trunk/drivers/net/wireless/libertas/if_spi.c b/trunk/drivers/net/wireless/libertas/if_spi.c index 9604a1c4a74d..4bb6574f4073 100644 --- a/trunk/drivers/net/wireless/libertas/if_spi.c +++ b/trunk/drivers/net/wireless/libertas/if_spi.c @@ -1124,7 +1124,7 @@ static void if_spi_resume_worker(struct work_struct *work) } } -static int __devinit if_spi_probe(struct spi_device *spi) +static int if_spi_probe(struct spi_device *spi) { struct if_spi_card *card; struct lbs_private *priv = NULL; @@ -1226,7 +1226,7 @@ static int __devinit if_spi_probe(struct spi_device *spi) return err; } -static int __devexit libertas_spi_remove(struct spi_device *spi) +static int libertas_spi_remove(struct spi_device *spi) { struct if_spi_card *card = spi_get_drvdata(spi); struct lbs_private *priv = card->priv; @@ -1285,7 +1285,7 @@ static const struct dev_pm_ops if_spi_pm_ops = { static struct spi_driver libertas_spi_driver = { .probe = if_spi_probe, - .remove = __devexit_p(libertas_spi_remove), + .remove = libertas_spi_remove, .driver = { .name = "libertas_spi", .owner = THIS_MODULE,