aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-01-14 19:14:31 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 10:02:39 -0500
commit0e0fad8f71a8a23fad223b7d72b4ba06d57f764f (patch)
treefd73294166cb419200e6439be9dd7841a2bcf554 /drivers/pcmcia
parent1540eec5e5549b2e41704ce77f3f4ba880d2434c (diff)
[PATCH] pcmcia: size reduction if ioctl isn't compiled
If the kernel is configured to not include the deprecated PCMCIA ioctl, some code doesn't need to be built. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/ds.c2
-rw-r--r--drivers/pcmcia/ds_internal.h2
-rw-r--r--drivers/pcmcia/rsrc_mgr.c4
3 files changed, 7 insertions, 1 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 4d11b35d4c37..211aa84353fc 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -835,9 +835,11 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
835 struct pcmcia_driver * p_drv = to_pcmcia_drv(drv); 835 struct pcmcia_driver * p_drv = to_pcmcia_drv(drv);
836 struct pcmcia_device_id *did = p_drv->id_table; 836 struct pcmcia_device_id *did = p_drv->id_table;
837 837
838#ifdef CONFIG_PCMCIA_IOCTL
838 /* matching by cardmgr */ 839 /* matching by cardmgr */
839 if (p_dev->cardmgr == p_drv) 840 if (p_dev->cardmgr == p_drv)
840 return 1; 841 return 1;
842#endif
841 843
842 while (did && did->match_flags) { 844 while (did && did->match_flags) {
843 if (pcmcia_devmatch(p_dev, did)) 845 if (pcmcia_devmatch(p_dev, did))
diff --git a/drivers/pcmcia/ds_internal.h b/drivers/pcmcia/ds_internal.h
index d359bd25a51c..783d8617a05c 100644
--- a/drivers/pcmcia/ds_internal.h
+++ b/drivers/pcmcia/ds_internal.h
@@ -15,7 +15,7 @@ extern void handle_event(struct pcmcia_socket *s, event_t event);
15extern int handle_request(struct pcmcia_socket *s, event_t event); 15extern int handle_request(struct pcmcia_socket *s, event_t event);
16#else 16#else
17static inline void __init pcmcia_setup_ioctl(void) { return; } 17static inline void __init pcmcia_setup_ioctl(void) { return; }
18static inline void __init pcmcia_cleanup_ioctl(void) { return; } 18static inline void __exit pcmcia_cleanup_ioctl(void) { return; }
19static inline void handle_event(struct pcmcia_socket *s, event_t event) { return; } 19static inline void handle_event(struct pcmcia_socket *s, event_t event) { return; }
20static inline int handle_request(struct pcmcia_socket *s, event_t event) { return CS_SUCCESS; } 20static inline int handle_request(struct pcmcia_socket *s, event_t event) { return CS_SUCCESS; }
21#endif 21#endif
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index e5a33121de77..81dfc2cac2b4 100644
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -21,6 +21,8 @@
21#include "cs_internal.h" 21#include "cs_internal.h"
22 22
23 23
24#ifdef CONFIG_PCMCIA_IOCTL
25
24#ifdef CONFIG_PCMCIA_PROBE 26#ifdef CONFIG_PCMCIA_PROBE
25 27
26static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) 28static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)
@@ -97,6 +99,8 @@ int pcmcia_adjust_resource_info(adjust_t *adj)
97} 99}
98EXPORT_SYMBOL(pcmcia_adjust_resource_info); 100EXPORT_SYMBOL(pcmcia_adjust_resource_info);
99 101
102#endif
103
100int pcmcia_validate_mem(struct pcmcia_socket *s) 104int pcmcia_validate_mem(struct pcmcia_socket *s)
101{ 105{
102 if (s->resource_ops->validate_mem) 106 if (s->resource_ops->validate_mem)