summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSolomon Peachy2013-06-02 15:53:03 +0200
committerJohn W. Linville2013-06-03 21:54:55 +0200
commit6dd64a304eff76ca7dd41bf63df55efa965fa9ec (patch)
tree9fecf663307061ad6c35933b78c1a203552cad8b /include
parentcw1200: Reference correct 'powerup' GPIO signal. (diff)
downloadkernel-qcow2-linux-6dd64a304eff76ca7dd41bf63df55efa965fa9ec.tar.gz
kernel-qcow2-linux-6dd64a304eff76ca7dd41bf63df55efa965fa9ec.tar.xz
kernel-qcow2-linux-6dd64a304eff76ca7dd41bf63df55efa965fa9ec.zip
cw1200: Replace use of 'struct resource' with 'int' for GPIO fields.
The only advantage of 'struct resource' is that it lets us assign names as part of the platform data. Unfortunately since we are using platform data, we are already limited to a single instance of each driver, rendering this moot. So, replace the struct resources with ints, resulting in cleaner code. This was based on a suggestion from Arnd Bergmann. Signed-off-by: Solomon Peachy <pizza@shaftnet.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/platform_data/cw1200_platform.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/platform_data/cw1200_platform.h b/include/linux/platform_data/cw1200_platform.h
index c168fa512347..4454c16ea3e5 100644
--- a/include/linux/platform_data/cw1200_platform.h
+++ b/include/linux/platform_data/cw1200_platform.h
@@ -14,8 +14,8 @@ struct cw1200_platform_data_spi {
/* All others are optional */
bool have_5ghz;
- const struct resource *reset; /* GPIO to RSTn signal */
- const struct resource *powerup; /* GPIO to POWERUP signal */
+ int reset; /* GPIO to RSTn signal (0 disables) */
+ int powerup; /* GPIO to POWERUP signal (0 disables) */
int (*power_ctrl)(const struct cw1200_platform_data_spi *pdata,
bool enable); /* Control 3v3 / 1v8 supply */
int (*clk_ctrl)(const struct cw1200_platform_data_spi *pdata,
@@ -28,11 +28,11 @@ struct cw1200_platform_data_sdio {
u16 ref_clk; /* REQUIRED (in KHz) */
/* All others are optional */
- const struct resource *irq; /* if using GPIO for IRQ */
bool have_5ghz;
- bool no_nptb; /* SDIO hardware does not support non-power-of-2-blocksizes */
- const struct resource *reset; /* GPIO to RSTn signal */
- const struct resource *powerup; /* GPIO to POWERUP signal */
+ bool no_nptb; /* SDIO hardware does not support non-power-of-2-blocksizes */
+ int reset; /* GPIO to RSTn signal (0 disables) */
+ int powerup; /* GPIO to POWERUP signal (0 disables) */
+ int irq; /* IRQ line or 0 to use SDIO IRQ */
int (*power_ctrl)(const struct cw1200_platform_data_sdio *pdata,
bool enable); /* Control 3v3 / 1v8 supply */
int (*clk_ctrl)(const struct cw1200_platform_data_sdio *pdata,