r4741 - developers/werner/wlan-spi/patches-tracking

[werner at docs.openmoko.org]

Author: werner
Date: 2008-11-02 15:05:06 +0100 (Sun, 02 Nov 2008)
New Revision: 4741

Modified:
   developers/werner/wlan-spi/patches-tracking/gta02-mmc-mci.patch
   developers/werner/wlan-spi/patches-tracking/hif-linux-sdio.patch
   developers/werner/wlan-spi/patches-tracking/series
Log:
Yet more cleanup. Avoid the traps that break module unloading.

drivers/ar6000/hif/hif2.c:
- removed MODULE_LICENSE since it's already in ar6000_drv.c
- removed MODULE_AUTHOR since I'm only to blame for a tiny fraction of the code
  in the module :-)
- HIFShutDownDevice: don't use the trojan "hif" NULL pointer ...
- sdio_ar6000_remove: avoid death by recursion, don't call deviceRemovedHandler



Modified: developers/werner/wlan-spi/patches-tracking/gta02-mmc-mci.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/gta02-mmc-mci.patch	2008-11-02 13:03:00 UTC (rev 4740)
+++ developers/werner/wlan-spi/patches-tracking/gta02-mmc-mci.patch	2008-11-02 14:05:06 UTC (rev 4741)
@@ -2,8 +2,8 @@
 
 Index: ktrack/arch/arm/mach-s3c2440/Kconfig
 ===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/Kconfig	2008-11-02 07:32:56.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/Kconfig	2008-11-02 07:32:56.000000000 -0200
+--- ktrack.orig/arch/arm/mach-s3c2440/Kconfig	2008-11-02 11:04:06.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/Kconfig	2008-11-02 11:04:06.000000000 -0200
 @@ -113,6 +113,11 @@
                  bool "GPIO bit-banging SPI"
                  select MMC_SPI
@@ -18,8 +18,8 @@
  endmenu
 Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c
 ===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c	2008-11-02 07:32:56.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c	2008-11-02 07:32:56.000000000 -0200
+--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c	2008-11-02 11:04:06.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c	2008-11-02 11:04:06.000000000 -0200
 @@ -1720,6 +1720,11 @@
  	platform_device_register(&gta02_spi_wlan);
  #endif /* CONFIG_AR6K_SPI_S3C24XX_GPIO */

Modified: developers/werner/wlan-spi/patches-tracking/hif-linux-sdio.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/hif-linux-sdio.patch	2008-11-02 13:03:00 UTC (rev 4740)
+++ developers/werner/wlan-spi/patches-tracking/hif-linux-sdio.patch	2008-11-02 14:05:06 UTC (rev 4741)
@@ -25,8 +25,8 @@
 Index: ktrack/drivers/ar6000/hif/hif2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ktrack/drivers/ar6000/hif/hif2.c	2008-11-02 11:01:12.000000000 -0200
-@@ -0,0 +1,592 @@
++++ ktrack/drivers/ar6000/hif/hif2.c	2008-11-02 12:01:30.000000000 -0200
+@@ -0,0 +1,593 @@
 +/*
 + * hif2.c - HIF layer re-implementation for the Linux SDIO stack
 + *
@@ -545,9 +545,16 @@
 +	HIF_DEVICE *hif = sdio_get_drvdata(func);
 +	int ret;
 +
++#if 0
++	/*
++	 * Funny, Atheros' HIF does this call, but this just puts us in a
++	 * recursion through HTCShutDown/HIFShutDown if unloading the
++	 * module.
++	 */
 +	ret = htcCallbacks.deviceRemovedHandler(hif->htc_handle, A_OK);
 +	if (ret != A_OK)
 +		dev_err(dev, "deviceRemovedHandler: %d\n", ret);
++#endif
 +	wait_queue_empty(hif);
 +	ret = kthread_stop(hif->io_task);
 +	if (ret)
@@ -610,12 +617,6 @@
 +
 +void HIFShutDownDevice(HIF_DEVICE *hif)
 +{
-+	struct device *dev = HIFGetOSDevice(hif);
-+
-+	dev_dbg(dev, "HIFShutDownDevice\n");
++	/* Beware, HTCShutDown calls us with hif == NULL ! */
 +	sdio_unregister_driver(&sdio_ar6000_driver);
 +}
-+
-+
-+MODULE_AUTHOR("Werner Almesberger");
-+MODULE_LICENSE("GPL v2");

Modified: developers/werner/wlan-spi/patches-tracking/series
===================================================================
--- developers/werner/wlan-spi/patches-tracking/series	2008-11-02 13:03:00 UTC (rev 4740)
+++ developers/werner/wlan-spi/patches-tracking/series	2008-11-02 14:05:06 UTC (rev 4741)
@@ -32,4 +32,3 @@
 
 # still needs a bit more love ...
 #s3c-mmc-sdio-int.patch
-#ecc