The patch titled
spi: new orion_spi driver (fixes)
has been removed from the -mm tree. Its filename was
spi-new-orion_spi-driver-fixes.patch
This patch was dropped because it was folded into spi-new-orion_spi-driver.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: spi: new orion_spi driver (fixes)
From: Shadi Ammouri <shadi@xxxxxxxxxxx>
added cancel_work_sync to cancel the work of the device when removing it,
and flush_workqueue on the driver's removal.
here is the patch with the modifications needed by the two comments:
Cc: Saeed Bishara <saeed@xxxxxxxxxxx>
Cc: Lennert Buytenhek <buytenh@xxxxxxxxxxx>
Cc: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/spi/orion_spi.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff -puN drivers/spi/orion_spi.c~spi-new-orion_spi-driver-fixes drivers/spi/orion_spi.c
--- a/drivers/spi/orion_spi.c~spi-new-orion_spi-driver-fixes
+++ a/drivers/spi/orion_spi.c
@@ -138,6 +138,7 @@ orion_spi_setup_transfer(struct spi_devi
struct orion_spi *orion_spi;
unsigned int speed = spi->max_speed_hz;
unsigned int bits_per_word = spi->bits_per_word;
+ int rc;
orion_spi = spi_master_get_devdata(spi->master);
@@ -147,13 +148,11 @@ orion_spi_setup_transfer(struct spi_devi
if ((t != NULL) && t->bits_per_word)
bits_per_word = t->bits_per_word;
- if (orion_spi_baudrate_set(spi, speed) != 0)
- return -EINVAL;
-
- if (orion_spi_set_transfer_size(orion_spi, bits_per_word) != 0)
- return -EINVAL;
+ rc = orion_spi_baudrate_set(spi, speed);
+ if (rc)
+ return rc;
- return 0;
+ return orion_spi_set_transfer_size(orion_spi, bits_per_word);
}
static void orion_spi_set_cs(struct orion_spi *orion_spi, int enable)
@@ -530,6 +529,8 @@ static int __exit orion_spi_remove(struc
master = dev_get_drvdata(&pdev->dev);
spi = spi_master_get_devdata(master);
+ cancel_work_sync(&spi->work);
+
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(r->start, (r->end - r->start) + 1);
@@ -561,6 +562,7 @@ module_init(orion_spi_init);
static void __exit orion_spi_exit(void)
{
+ flush_workqueue(orion_spi_wq);
platform_driver_unregister(&orion_spi_driver);
destroy_workqueue(orion_spi_wq);
_
Patches currently in -mm which might be from shadi@xxxxxxxxxxx are
spi-new-orion_spi-driver.patch
spi-new-orion_spi-driver-fixes.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
