diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-10-24 09:57:22 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-09 02:30:06 -0500 |
commit | 9cb495bb41f07a3ebfc60d3b9d26017a1fd7050c (patch) | |
tree | f2dda0b4dfdf0c27eaa28d4383b38dab8aab57f0 /include/pcmcia/ds.h | |
parent | 9b44de2015ff4a2ed1d56efedfcc72b917d356a6 (diff) |
pcmcia: remove now-defunct cs_error, pcmcia_error_{func,ret}
As all in-tree drivers have been converted to not use cs_error() any more,
drop these functions and definitions, and update the Documentation.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia/ds.h')
-rw-r--r-- | include/pcmcia/ds.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index 6c37d4ed7832..d82392de4e92 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -142,42 +142,6 @@ struct pcmcia_device { | |||
142 | #define handle_to_dev(handle) (handle->dev) | 142 | #define handle_to_dev(handle) (handle->dev) |
143 | 143 | ||
144 | 144 | ||
145 | /* (deprecated) error reporting by PCMCIA devices. Use dev_printk() | ||
146 | * or dev_dbg() directly in the driver, without referring to pcmcia_error_func() | ||
147 | * and/or pcmcia_error_ret() for those functions will go away soon. | ||
148 | */ | ||
149 | enum service { | ||
150 | AccessConfigurationRegister, AddSocketServices, | ||
151 | AdjustResourceInfo, CheckEraseQueue, CloseMemory, CopyMemory, | ||
152 | DeregisterClient, DeregisterEraseQueue, GetCardServicesInfo, | ||
153 | GetClientInfo, GetConfigurationInfo, GetEventMask, | ||
154 | GetFirstClient, GetFirstPartion, GetFirstRegion, GetFirstTuple, | ||
155 | GetNextClient, GetNextPartition, GetNextRegion, GetNextTuple, | ||
156 | GetStatus, GetTupleData, MapLogSocket, MapLogWindow, MapMemPage, | ||
157 | MapPhySocket, MapPhyWindow, ModifyConfiguration, ModifyWindow, | ||
158 | OpenMemory, ParseTuple, ReadMemory, RegisterClient, | ||
159 | RegisterEraseQueue, RegisterMTD, RegisterTimer, | ||
160 | ReleaseConfiguration, ReleaseExclusive, ReleaseIO, ReleaseIRQ, | ||
161 | ReleaseSocketMask, ReleaseWindow, ReplaceSocketServices, | ||
162 | RequestConfiguration, RequestExclusive, RequestIO, RequestIRQ, | ||
163 | RequestSocketMask, RequestWindow, ResetCard, ReturnSSEntry, | ||
164 | SetEventMask, SetRegion, ValidateCIS, VendorSpecific, | ||
165 | WriteMemory, BindDevice, BindMTD, ReportError, | ||
166 | SuspendCard, ResumeCard, EjectCard, InsertCard, ReplaceCIS, | ||
167 | GetFirstWindow, GetNextWindow, GetMemPage | ||
168 | }; | ||
169 | const char *pcmcia_error_func(int func); | ||
170 | const char *pcmcia_error_ret(int ret); | ||
171 | |||
172 | #define cs_error(p_dev, func, ret) \ | ||
173 | { \ | ||
174 | dev_printk(KERN_NOTICE, &p_dev->dev, \ | ||
175 | "%s : %s\n", \ | ||
176 | pcmcia_error_func(func), \ | ||
177 | pcmcia_error_ret(ret)); \ | ||
178 | } | ||
179 | |||
180 | |||
181 | /* | 145 | /* |
182 | * CIS access. | 146 | * CIS access. |
183 | * | 147 | * |