Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc52692c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: iio: remove __dev* attributes. 



CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, and __devexit
from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe31edc8

drivers/iio/accel/hid-sensor-accel-3d.c

+2 −2
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static int accel_3d_parse_report(struct platform_device *pdev, 
}



/* Function to initialize the processing for usage id */

static int __devinit hid_accel_3d_probe(struct platform_device *pdev)

static int hid_accel_3d_probe(struct platform_device *pdev)

{

	int ret = 0;

	static const char *name = "accel_3d";
@@ -375,7 +375,7 @@ static int __devinit hid_accel_3d_probe(struct platform_device *pdev) 
}



/* Function to deinitialize the processing for usage id */

static int __devinit hid_accel_3d_remove(struct platform_device *pdev)

static int hid_accel_3d_remove(struct platform_device *pdev)

{

	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;

	struct iio_dev *indio_dev = platform_get_drvdata(pdev);

drivers/iio/adc/ad7266.c

+4 −4
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static const struct ad7266_chan_info ad7266_chan_infos[] = { 
	},

};



static void __devinit ad7266_init_channels(struct iio_dev *indio_dev)

static void ad7266_init_channels(struct iio_dev *indio_dev)

{

	struct ad7266_state *st = iio_priv(indio_dev);

	bool is_differential, is_signed;
@@ -391,7 +391,7 @@ static const char * const ad7266_gpio_labels[] = { 
	"AD0", "AD1", "AD2",

};



static int __devinit ad7266_probe(struct spi_device *spi)

static int ad7266_probe(struct spi_device *spi)

{

	struct ad7266_platform_data *pdata = spi->dev.platform_data;

	struct iio_dev *indio_dev;
@@ -494,7 +494,7 @@ static int __devinit ad7266_probe(struct spi_device *spi) 
	return ret;

}



static int __devexit ad7266_remove(struct spi_device *spi)

static int ad7266_remove(struct spi_device *spi)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct ad7266_state *st = iio_priv(indio_dev);
@@ -525,7 +525,7 @@ static struct spi_driver ad7266_driver = { 
		.owner	= THIS_MODULE,

	},

	.probe		= ad7266_probe,

	.remove		= __devexit_p(ad7266_remove),

	.remove		= ad7266_remove,

	.id_table	= ad7266_id,

};

module_spi_driver(ad7266_driver);

drivers/iio/adc/ad7298.c

+3 −3
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static const struct iio_info ad7298_info = { 
	.driver_module = THIS_MODULE,

};



static int __devinit ad7298_probe(struct spi_device *spi)

static int ad7298_probe(struct spi_device *spi)

{

	struct ad7298_platform_data *pdata = spi->dev.platform_data;

	struct ad7298_state *st;
@@ -370,7 +370,7 @@ static int __devinit ad7298_probe(struct spi_device *spi) 
	return ret;

}



static int __devexit ad7298_remove(struct spi_device *spi)

static int ad7298_remove(struct spi_device *spi)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct ad7298_state *st = iio_priv(indio_dev);
@@ -398,7 +398,7 @@ static struct spi_driver ad7298_driver = { 
		.owner	= THIS_MODULE,

	},

	.probe		= ad7298_probe,

	.remove		= __devexit_p(ad7298_remove),

	.remove		= ad7298_remove,

	.id_table	= ad7298_id,

};

module_spi_driver(ad7298_driver);

drivers/iio/adc/ad7476.c

+3 −3
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static const struct iio_info ad7476_info = { 
	.read_raw = &ad7476_read_raw,

};



static int __devinit ad7476_probe(struct spi_device *spi)

static int ad7476_probe(struct spi_device *spi)

{

	struct ad7476_state *st;

	struct iio_dev *indio_dev;
@@ -277,7 +277,7 @@ static int __devinit ad7476_probe(struct spi_device *spi) 
	return ret;

}



static int __devexit ad7476_remove(struct spi_device *spi)

static int ad7476_remove(struct spi_device *spi)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct ad7476_state *st = iio_priv(indio_dev);
@@ -322,7 +322,7 @@ static struct spi_driver ad7476_driver = { 
		.owner	= THIS_MODULE,

	},

	.probe		= ad7476_probe,

	.remove		= __devexit_p(ad7476_remove),

	.remove		= ad7476_remove,

	.id_table	= ad7476_id,

};

module_spi_driver(ad7476_driver);

drivers/iio/adc/ad7791.c

+5 −5
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static const struct iio_info ad7791_no_filter_info = { 
	.driver_module = THIS_MODULE,

};



static int __devinit ad7791_setup(struct ad7791_state *st,

static int ad7791_setup(struct ad7791_state *st,

			struct ad7791_platform_data *pdata)

{

	/* Set to poweron-reset default values */
@@ -349,7 +349,7 @@ static int __devinit ad7791_setup(struct ad7791_state *st, 
		st->mode);

}



static int __devinit ad7791_probe(struct spi_device *spi)

static int ad7791_probe(struct spi_device *spi)

{

	struct ad7791_platform_data *pdata = spi->dev.platform_data;

	struct iio_dev *indio_dev;
@@ -418,7 +418,7 @@ static int __devinit ad7791_probe(struct spi_device *spi) 
	return ret;

}



static int __devexit ad7791_remove(struct spi_device *spi)

static int ad7791_remove(struct spi_device *spi)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct ad7791_state *st = iio_priv(indio_dev);
@@ -450,7 +450,7 @@ static struct spi_driver ad7791_driver = { 
		.owner	= THIS_MODULE,

	},

	.probe		= ad7791_probe,

	.remove		= __devexit_p(ad7791_remove),

	.remove		= ad7791_remove,

	.id_table	= ad7791_spi_ids,

};

module_spi_driver(ad7791_driver);