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

Commit db389b61 authored by Mike Frysinger's avatar Mike Frysinger Committed by Grant Likely
Browse files

spidev: add proper section markers 



The driver already uses __devexit_p() in the structure, but looks like
actual __dev{init,exit} markings were forgotten.

The spidev_spi driver also needs renaming to include a "_driver" suffix to
avoid section mismatch warnings.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 8ae1c924

drivers/spi/spidev.c

+8 −8
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static struct class *spidev_class; 


/*-------------------------------------------------------------------------*/



static int spidev_probe(struct spi_device *spi)

static int __devinit spidev_probe(struct spi_device *spi)

{

	struct spidev_data	*spidev;

	int			status;
@@ -610,7 +610,7 @@ static int spidev_probe(struct spi_device *spi) 
	return status;

}



static int spidev_remove(struct spi_device *spi)

static int __devexit spidev_remove(struct spi_device *spi)

{

	struct spidev_data	*spidev = spi_get_drvdata(spi);
@@ -632,7 +632,7 @@ static int spidev_remove(struct spi_device *spi) 
	return 0;

}



static struct spi_driver spidev_spi = {

static struct spi_driver spidev_spi_driver = {

	.driver = {

		.name =		"spidev",

		.owner =	THIS_MODULE,
@@ -664,14 +664,14 @@ static int __init spidev_init(void) 


	spidev_class = class_create(THIS_MODULE, "spidev");

	if (IS_ERR(spidev_class)) {

		unregister_chrdev(SPIDEV_MAJOR, spidev_spi.driver.name);

		unregister_chrdev(SPIDEV_MAJOR, spidev_spi_driver.driver.name);

		return PTR_ERR(spidev_class);

	}



	status = spi_register_driver(&spidev_spi);

	status = spi_register_driver(&spidev_spi_driver);

	if (status < 0) {

		class_destroy(spidev_class);

		unregister_chrdev(SPIDEV_MAJOR, spidev_spi.driver.name);

		unregister_chrdev(SPIDEV_MAJOR, spidev_spi_driver.driver.name);

	}

	return status;

}
@@ -679,9 +679,9 @@ module_init(spidev_init); 


static void __exit spidev_exit(void)

{

	spi_unregister_driver(&spidev_spi);

	spi_unregister_driver(&spidev_spi_driver);

	class_destroy(spidev_class);

	unregister_chrdev(SPIDEV_MAJOR, spidev_spi.driver.name);

	unregister_chrdev(SPIDEV_MAJOR, spidev_spi_driver.driver.name);

}

module_exit(spidev_exit);