Skip to content

Commit 4bf1541

Browse files
bulwahnDominik Brodowski
authored andcommitted
pcmcia: remove PCCARD_IODYN
The config PCCARD_IODYN was last used in the config option PCMCIA_M8XX with its m8xx_pcmcia driver. This driver was removed with commit 39eb56d ("pcmcia: Remove m8xx_pcmcia driver"), included in v3.17, back in 2014. Since then, the config PCCARD_IODYN is unused. Remove the config option, the corresponding file included with this config and the corresponding definition in the pcmcia header file. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@redhat.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
1 parent ce0e8ef commit 4bf1541

4 files changed

Lines changed: 1 addition & 182 deletions

File tree

drivers/pcmcia/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,4 @@ config ELECTRA_CF
250250
config PCCARD_NONSTATIC
251251
bool
252252

253-
config PCCARD_IODYN
254-
bool
255-
256253
endif # PCCARD

drivers/pcmcia/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ obj-$(CONFIG_PCMCIA) += pcmcia.o
1212

1313
pcmcia_rsrc-y += rsrc_mgr.o
1414
pcmcia_rsrc-$(CONFIG_PCCARD_NONSTATIC) += rsrc_nonstatic.o
15-
pcmcia_rsrc-$(CONFIG_PCCARD_IODYN) += rsrc_iodyn.o
1615
obj-$(CONFIG_PCCARD) += pcmcia_rsrc.o
1716

1817

drivers/pcmcia/rsrc_iodyn.c

Lines changed: 0 additions & 171 deletions
This file was deleted.

include/pcmcia/ss.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,26 +227,20 @@ struct pcmcia_socket {
227227

228228

229229
/* socket drivers must define the resource operations type they use. There
230-
* are three options:
230+
* are two options:
231231
* - pccard_static_ops iomem and ioport areas are assigned statically
232-
* - pccard_iodyn_ops iomem areas is assigned statically, ioport
233-
* areas dynamically
234-
* If this option is selected, use
235-
* "select PCCARD_IODYN" in Kconfig.
236232
* - pccard_nonstatic_ops iomem and ioport areas are assigned dynamically.
237233
* If this option is selected, use
238234
* "select PCCARD_NONSTATIC" in Kconfig.
239235
*
240236
*/
241237
extern struct pccard_resource_ops pccard_static_ops;
242238
#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
243-
extern struct pccard_resource_ops pccard_iodyn_ops;
244239
extern struct pccard_resource_ops pccard_nonstatic_ops;
245240
#else
246241
/* If PCMCIA is not used, but only CARDBUS, these functions are not used
247242
* at all. Therefore, do not use the large (240K!) rsrc_nonstatic module
248243
*/
249-
#define pccard_iodyn_ops pccard_static_ops
250244
#define pccard_nonstatic_ops pccard_static_ops
251245
#endif
252246

0 commit comments

Comments
 (0)