Merge tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[~andy/linux] / drivers / extcon / extcon-adc-jack.c

diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c
index e87196f6d2d2db43f945e6317b3d14fe09e680f4..d0233cd18ffa71b37bb7b0dbc2434cebac964d90 100644 (file)
--- a/drivers/extcon/extcon-adc-jack.c
+++ b/drivers/extcon/extcon-adc-jack.c
@@ -91,7 +91,7 @@ static irqreturn_t adc_jack_irq_thread(int irq, void *_data)
        return IRQ_HANDLED;
 }
 
-static int __devinit adc_jack_probe(struct platform_device *pdev)
+static int adc_jack_probe(struct platform_device *pdev)
 {
        struct adc_jack_data *data;
        struct adc_jack_pdata *pdata = pdev->dev.platform_data;
@@ -135,8 +135,7 @@ static int __devinit adc_jack_probe(struct platform_device *pdev)
                ;
        data->num_conditions = i;
 
-       data->chan = iio_channel_get(dev_name(&pdev->dev),
-                       pdata->consumer_channel);
+       data->chan = iio_channel_get(&pdev->dev, pdata->consumer_channel);
        if (IS_ERR(data->chan)) {
                err = PTR_ERR(data->chan);
                goto out;
@@ -175,7 +174,7 @@ out:
        return err;
 }
 
-static int __devexit adc_jack_remove(struct platform_device *pdev)
+static int adc_jack_remove(struct platform_device *pdev)
 {
        struct adc_jack_data *data = platform_get_drvdata(pdev);
 
@@ -188,7 +187,7 @@ static int __devexit adc_jack_remove(struct platform_device *pdev)
 
 static struct platform_driver adc_jack_driver = {
        .probe          = adc_jack_probe,
-       .remove         = __devexit_p(adc_jack_remove),
+       .remove         = adc_jack_remove,
        .driver         = {
                .name   = "adc-jack",
                .owner  = THIS_MODULE,