Skip to content

Commit

Permalink
spidev: add proper section markers
Browse files Browse the repository at this point in the history
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: Mike Frysinger <vapier@gentoo.org>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  • Loading branch information
Mike Frysinger authored and Grant Likely committed Dec 17, 2009
1 parent 8ae1c92 commit db389b6
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/spi/spidev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand All @@ -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,
Expand Down Expand Up @@ -664,24 +664,24 @@ 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;
}
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);

Expand Down

0 comments on commit db389b6

Please sign in to comment.