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

Commit 18c06353 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 

* 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
  drivercore: Add helper macro for platform_driver boilerplate
  spi: irq: Remove IRQF_DISABLED
  OMAP: SPI: Fix the trying to free nonexistent resource error
  spi/spi-ep93xx: add module.h include
  spi/tegra: fix compilation error in spi-tegra.c
  spi: spi-dw: fix all sparse warnings
  spi/spi-pl022: Call pl022_dma_remove(pl022) only if enable_dma is true
  spi/spi-pl022: calculate_effective_freq() must set rate <= requested rate
  spi/spi-pl022: Don't allocate more sg than required.
  spi/spi-pl022: Use GFP_ATOMIC for allocation from tasklet
  spi/spi-pl022: Resolve formatting issues
parents 41684f67 940ab889

drivers/spi/spi-altera.c

+1 −12
Original line number Diff line number Diff line
@@ -320,18 +320,7 @@ static struct platform_driver altera_spi_driver = { 
		.of_match_table = altera_spi_match,

	},

};



static int __init altera_spi_init(void)

{

	return platform_driver_register(&altera_spi_driver);

}

module_init(altera_spi_init);



static void __exit altera_spi_exit(void)

{

	platform_driver_unregister(&altera_spi_driver);

}

module_exit(altera_spi_exit);

module_platform_driver(altera_spi_driver);



MODULE_DESCRIPTION("Altera SPI driver");

MODULE_AUTHOR("Thomas Chou <thomas@wytron.com.tw>");

drivers/spi/spi-ath79.c

+1 −12
Original line number Diff line number Diff line
@@ -273,18 +273,7 @@ static struct platform_driver ath79_spi_driver = { 
		.owner	= THIS_MODULE,

	},

};



static __init int ath79_spi_init(void)

{

	return platform_driver_register(&ath79_spi_driver);

}

module_init(ath79_spi_init);



static __exit void ath79_spi_exit(void)

{

	platform_driver_unregister(&ath79_spi_driver);

}

module_exit(ath79_spi_exit);

module_platform_driver(ath79_spi_driver);



MODULE_DESCRIPTION("SPI controller driver for Atheros AR71XX/AR724X/AR913X");

MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");

drivers/spi/spi-atmel.c

+1 −12
Original line number Diff line number Diff line
@@ -1074,18 +1074,7 @@ static struct platform_driver atmel_spi_driver = { 
	.resume		= atmel_spi_resume,

	.remove		= __exit_p(atmel_spi_remove),

};



static int __init atmel_spi_init(void)

{

	return platform_driver_probe(&atmel_spi_driver, atmel_spi_probe);

}

module_init(atmel_spi_init);



static void __exit atmel_spi_exit(void)

{

	platform_driver_unregister(&atmel_spi_driver);

}

module_exit(atmel_spi_exit);

module_platform_driver(atmel_spi_driver);



MODULE_DESCRIPTION("Atmel AT32/AT91 SPI Controller driver");

MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");

drivers/spi/spi-bfin-sport.c

+1 −12
Original line number Diff line number Diff line
@@ -938,15 +938,4 @@ static struct platform_driver bfin_sport_spi_driver = { 
	.suspend = bfin_sport_spi_suspend,

	.resume  = bfin_sport_spi_resume,

};



static int __init bfin_sport_spi_init(void)

{

	return platform_driver_register(&bfin_sport_spi_driver);

}

module_init(bfin_sport_spi_init);



static void __exit bfin_sport_spi_exit(void)

{

	platform_driver_unregister(&bfin_sport_spi_driver);

}

module_exit(bfin_sport_spi_exit);
 
module_platform_driver(bfin_sport_spi_driver);

drivers/spi/spi-bfin5xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static int bfin_spi_setup(struct spi_device *spi) 


	if (chip->pio_interrupt && !drv_data->irq_requested) {

		ret = request_irq(drv_data->spi_irq, bfin_spi_pio_irq_handler,

			IRQF_DISABLED, "BFIN_SPI", drv_data);

			0, "BFIN_SPI", drv_data);

		if (ret) {

			dev_err(&spi->dev, "Unable to register spi IRQ\n");

			goto error;