diff options
author | Adrian McMenamin <adrian@newgolddream.dyndns.info> | 2008-02-06 17:46:21 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-02-14 00:22:07 -0500 |
commit | b9482378916abb9a1e0a2334187cdc67f2deda2c (patch) | |
tree | a095de77171d9d65828fc1e531fad1128d130926 /include | |
parent | 86c0179c9307bd600a96a44d623814c33bdbe0f0 (diff) |
maple: fix up whitespace damage.
This patch is fundamentally about fixing up the whitespace problems
introduced by my previous patch (that brought the code into mainline). A
second patch will follow that will fix memory leaks. The two need to be
applied sequentially.
Signed-off-by: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/maple.h | 101 |
1 files changed, 51 insertions, 50 deletions
diff --git a/include/linux/maple.h b/include/linux/maple.h index bad9a7b319de..f82c17b77158 100644 --- a/include/linux/maple.h +++ b/include/linux/maple.h | |||
@@ -7,74 +7,75 @@ extern struct bus_type maple_bus_type; | |||
7 | 7 | ||
8 | /* Maple Bus command and response codes */ | 8 | /* Maple Bus command and response codes */ |
9 | enum maple_code { | 9 | enum maple_code { |
10 | MAPLE_RESPONSE_FILEERR = -5, | 10 | MAPLE_RESPONSE_FILEERR = -5, |
11 | MAPLE_RESPONSE_AGAIN = -4, /* request should be retransmitted */ | 11 | MAPLE_RESPONSE_AGAIN = -4, /* request should be retransmitted */ |
12 | MAPLE_RESPONSE_BADCMD = -3, | 12 | MAPLE_RESPONSE_BADCMD = -3, |
13 | MAPLE_RESPONSE_BADFUNC = -2, | 13 | MAPLE_RESPONSE_BADFUNC = -2, |
14 | MAPLE_RESPONSE_NONE = -1, /* unit didn't respond at all */ | 14 | MAPLE_RESPONSE_NONE = -1, /* unit didn't respond at all */ |
15 | MAPLE_COMMAND_DEVINFO = 1, | 15 | MAPLE_COMMAND_DEVINFO = 1, |
16 | MAPLE_COMMAND_ALLINFO = 2, | 16 | MAPLE_COMMAND_ALLINFO = 2, |
17 | MAPLE_COMMAND_RESET = 3, | 17 | MAPLE_COMMAND_RESET = 3, |
18 | MAPLE_COMMAND_KILL = 4, | 18 | MAPLE_COMMAND_KILL = 4, |
19 | MAPLE_RESPONSE_DEVINFO = 5, | 19 | MAPLE_RESPONSE_DEVINFO = 5, |
20 | MAPLE_RESPONSE_ALLINFO = 6, | 20 | MAPLE_RESPONSE_ALLINFO = 6, |
21 | MAPLE_RESPONSE_OK = 7, | 21 | MAPLE_RESPONSE_OK = 7, |
22 | MAPLE_RESPONSE_DATATRF = 8, | 22 | MAPLE_RESPONSE_DATATRF = 8, |
23 | MAPLE_COMMAND_GETCOND = 9, | 23 | MAPLE_COMMAND_GETCOND = 9, |
24 | MAPLE_COMMAND_GETMINFO = 10, | 24 | MAPLE_COMMAND_GETMINFO = 10, |
25 | MAPLE_COMMAND_BREAD = 11, | 25 | MAPLE_COMMAND_BREAD = 11, |
26 | MAPLE_COMMAND_BWRITE = 12, | 26 | MAPLE_COMMAND_BWRITE = 12, |
27 | MAPLE_COMMAND_SETCOND = 14 | 27 | MAPLE_COMMAND_SETCOND = 14 |
28 | }; | 28 | }; |
29 | 29 | ||
30 | struct mapleq { | 30 | struct mapleq { |
31 | struct list_head list; | 31 | struct list_head list; |
32 | struct maple_device *dev; | 32 | struct maple_device *dev; |
33 | void *sendbuf, *recvbuf, *recvbufdcsp; | 33 | void *sendbuf, *recvbuf, *recvbufdcsp; |
34 | unsigned char length; | 34 | unsigned char length; |
35 | enum maple_code command; | 35 | enum maple_code command; |
36 | }; | 36 | }; |
37 | 37 | ||
38 | struct maple_devinfo { | 38 | struct maple_devinfo { |
39 | unsigned long function; | 39 | unsigned long function; |
40 | unsigned long function_data[3]; | 40 | unsigned long function_data[3]; |
41 | unsigned char area_code; | 41 | unsigned char area_code; |
42 | unsigned char connector_directon; | 42 | unsigned char connector_directon; |
43 | char product_name[31]; | 43 | char product_name[31]; |
44 | char product_licence[61]; | 44 | char product_licence[61]; |
45 | unsigned short standby_power; | 45 | unsigned short standby_power; |
46 | unsigned short max_power; | 46 | unsigned short max_power; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | struct maple_device { | 49 | struct maple_device { |
50 | struct maple_driver *driver; | 50 | struct maple_driver *driver; |
51 | struct mapleq *mq; | 51 | struct mapleq *mq; |
52 | void *private_data; | 52 | void *private_data; |
53 | void (*callback) (struct mapleq * mq); | 53 | void (*callback) (struct mapleq * mq); |
54 | unsigned long when, interval, function; | 54 | unsigned long when, interval, function; |
55 | struct maple_devinfo devinfo; | 55 | struct maple_devinfo devinfo; |
56 | unsigned char port, unit; | 56 | unsigned char port, unit; |
57 | char product_name[32]; | 57 | char product_name[32]; |
58 | char product_licence[64]; | 58 | char product_licence[64]; |
59 | int registered; | 59 | int registered; |
60 | struct device dev; | 60 | struct device dev; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | struct maple_driver { | 63 | struct maple_driver { |
64 | unsigned long function; | 64 | unsigned long function; |
65 | int (*connect) (struct maple_device * dev); | 65 | int (*connect) (struct maple_device * dev); |
66 | void (*disconnect) (struct maple_device * dev); | 66 | void (*disconnect) (struct maple_device * dev); |
67 | struct device_driver drv; | 67 | struct device_driver drv; |
68 | int registered; | ||
68 | }; | 69 | }; |
69 | 70 | ||
70 | void maple_getcond_callback(struct maple_device *dev, | 71 | void maple_getcond_callback(struct maple_device *dev, |
71 | void (*callback) (struct mapleq * mq), | 72 | void (*callback) (struct mapleq * mq), |
72 | unsigned long interval, | 73 | unsigned long interval, |
73 | unsigned long function); | 74 | unsigned long function); |
74 | int maple_driver_register(struct device_driver *drv); | 75 | int maple_driver_register(struct device_driver *drv); |
75 | void maple_add_packet(struct mapleq *mq); | 76 | void maple_add_packet(struct mapleq *mq); |
76 | 77 | ||
77 | #define to_maple_dev(n) container_of(n, struct maple_device, dev) | 78 | #define to_maple_dev(n) container_of(n, struct maple_device, dev) |
78 | #define to_maple_driver(n) container_of(n, struct maple_driver, drv) | 79 | #define to_maple_driver(n) container_of(n, struct maple_driver, drv) |
79 | 80 | ||
80 | #endif /* __LINUX_MAPLE_H */ | 81 | #endif /* __LINUX_MAPLE_H */ |