Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit ac8b422838046ffc26be4874a3cbae0d313f4209

Authored by Dominik Brodowski
1 parent ce3f9d71bd
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

pcmcia: remove cs_types.h 

Remove cs_types.h which is no longer needed: Most definitions aren't
used at all, a few can be made away with, and two remaining definitions
(typedefs, unfortunatley) may be moved to more specific places.

CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
Acked-by: Marcel Holtmann <marcel@holtmann.org> (for drivers/bluetooth/)
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

Showing 90 changed files with 14 additions and 151 deletions Side-by-side Diff

Documentation/pcmcia/driver-changes.txt
Diff comments   View file @ ac8b422
1 1 This file details changes in 2.6 which affect PCMCIA card driver authors:
  2 +* No dev_info_t, no cs_types.h (as of 2.6.36)
  3 + dev_info_t and a few other typedefs are removed. No longer use them
  4 + in PCMCIA device drivers. Also, do not include pcmcia/cs_types.h, as
  5 + this file is gone.
  6 +
2 7 * No dev_node_t (as of 2.6.35)
3 8 There is no more need to fill out a "dev_node_t" structure.
4 9  
drivers/ata/pata_pcmcia.c
Diff comments   View file @ ac8b422
... ... @@ -34,7 +34,6 @@
34 34 #include <linux/ata.h>
35 35 #include <linux/libata.h>
36 36  
37   -#include <pcmcia/cs_types.h>
38 37 #include <pcmcia/cs.h>
39 38 #include <pcmcia/cistpl.h>
40 39 #include <pcmcia/ds.h>
drivers/bluetooth/bluecard_cs.c
Diff comments   View file @ ac8b422
... ... @@ -39,7 +39,6 @@
39 39 #include <linux/skbuff.h>
40 40 #include <linux/io.h>
41 41  
42   -#include <pcmcia/cs_types.h>
43 42 #include <pcmcia/cs.h>
44 43 #include <pcmcia/cistpl.h>
45 44 #include <pcmcia/ciscode.h>
drivers/bluetooth/bt3c_cs.c
Diff comments   View file @ ac8b422
... ... @@ -45,7 +45,6 @@
45 45 #include <linux/device.h>
46 46 #include <linux/firmware.h>
47 47  
48   -#include <pcmcia/cs_types.h>
49 48 #include <pcmcia/cs.h>
50 49 #include <pcmcia/cistpl.h>
51 50 #include <pcmcia/ciscode.h>
drivers/bluetooth/btuart_cs.c
Diff comments   View file @ ac8b422
... ... @@ -41,7 +41,6 @@
41 41 #include <asm/system.h>
42 42 #include <asm/io.h>
43 43  
44   -#include <pcmcia/cs_types.h>
45 44 #include <pcmcia/cs.h>
46 45 #include <pcmcia/cistpl.h>
47 46 #include <pcmcia/ciscode.h>
drivers/bluetooth/dtl1_cs.c
Diff comments   View file @ ac8b422
... ... @@ -41,7 +41,6 @@
41 41 #include <asm/system.h>
42 42 #include <asm/io.h>
43 43  
44   -#include <pcmcia/cs_types.h>
45 44 #include <pcmcia/cs.h>
46 45 #include <pcmcia/cistpl.h>
47 46 #include <pcmcia/ciscode.h>
drivers/char/pcmcia/cm4000_cs.c
Diff comments   View file @ ac8b422
... ... @@ -34,7 +34,6 @@
34 34 #include <linux/uaccess.h>
35 35 #include <linux/io.h>
36 36  
37   -#include <pcmcia/cs_types.h>
38 37 #include <pcmcia/cs.h>
39 38 #include <pcmcia/cistpl.h>
40 39 #include <pcmcia/cisreg.h>
drivers/char/pcmcia/cm4040_cs.c
Diff comments   View file @ ac8b422
... ... @@ -29,7 +29,6 @@
29 29 #include <asm/uaccess.h>
30 30 #include <asm/io.h>
31 31  
32   -#include <pcmcia/cs_types.h>
33 32 #include <pcmcia/cs.h>
34 33 #include <pcmcia/cistpl.h>
35 34 #include <pcmcia/cisreg.h>
drivers/char/pcmcia/ipwireless/main.h
Diff comments   View file @ ac8b422
... ... @@ -21,7 +21,6 @@
21 21 #include <linux/sched.h>
22 22 #include <linux/types.h>
23 23  
24   -#include <pcmcia/cs_types.h>
25 24 #include <pcmcia/cs.h>
26 25 #include <pcmcia/cistpl.h>
27 26 #include <pcmcia/ds.h>
drivers/char/pcmcia/ipwireless/tty.h
Diff comments   View file @ ac8b422
... ... @@ -21,7 +21,6 @@
21 21 #include <linux/types.h>
22 22 #include <linux/sched.h>
23 23  
24   -#include <pcmcia/cs_types.h>
25 24 #include <pcmcia/cs.h>
26 25 #include <pcmcia/cistpl.h>
27 26 #include <pcmcia/ds.h>
drivers/char/pcmcia/synclink_cs.c
Diff comments   View file @ ac8b422
... ... @@ -70,7 +70,6 @@
70 70 #include <linux/workqueue.h>
71 71 #include <linux/hdlc.h>
72 72  
73   -#include <pcmcia/cs_types.h>
74 73 #include <pcmcia/cs.h>
75 74 #include <pcmcia/cistpl.h>
76 75 #include <pcmcia/cisreg.h>
drivers/ide/ide-cs.c
Diff comments   View file @ ac8b422
... ... @@ -43,7 +43,6 @@
43 43 #include <asm/io.h>
44 44 #include <asm/system.h>
45 45  
46   -#include <pcmcia/cs_types.h>
47 46 #include <pcmcia/cs.h>
48 47 #include <pcmcia/cistpl.h>
49 48 #include <pcmcia/ds.h>
drivers/isdn/hardware/avm/avm_cs.c
Diff comments   View file @ ac8b422
... ... @@ -20,7 +20,6 @@
20 20 #include <asm/io.h>
21 21 #include <asm/system.h>
22 22  
23   -#include <pcmcia/cs_types.h>
24 23 #include <pcmcia/cs.h>
25 24 #include <pcmcia/cistpl.h>
26 25 #include <pcmcia/ciscode.h>
drivers/isdn/hisax/avma1_cs.c
Diff comments   View file @ ac8b422
... ... @@ -20,7 +20,6 @@
20 20 #include <asm/io.h>
21 21 #include <asm/system.h>
22 22  
23   -#include <pcmcia/cs_types.h>
24 23 #include <pcmcia/cs.h>
25 24 #include <pcmcia/cistpl.h>
26 25 #include <pcmcia/ds.h>
drivers/isdn/hisax/elsa_cs.c
Diff comments   View file @ ac8b422
... ... @@ -46,7 +46,6 @@
46 46 #include <asm/io.h>
47 47 #include <asm/system.h>
48 48  
49   -#include <pcmcia/cs_types.h>
50 49 #include <pcmcia/cs.h>
51 50 #include <pcmcia/cistpl.h>
52 51 #include <pcmcia/cisreg.h>
drivers/isdn/hisax/sedlbauer_cs.c
Diff comments   View file @ ac8b422
... ... @@ -46,7 +46,6 @@
46 46 #include <asm/io.h>
47 47 #include <asm/system.h>
48 48  
49   -#include <pcmcia/cs_types.h>
50 49 #include <pcmcia/cs.h>
51 50 #include <pcmcia/cistpl.h>
52 51 #include <pcmcia/cisreg.h>
drivers/isdn/hisax/teles_cs.c
Diff comments   View file @ ac8b422
... ... @@ -27,7 +27,6 @@
27 27 #include <asm/io.h>
28 28 #include <asm/system.h>
29 29  
30   -#include <pcmcia/cs_types.h>
31 30 #include <pcmcia/cs.h>
32 31 #include <pcmcia/cistpl.h>
33 32 #include <pcmcia/cisreg.h>
drivers/mmc/host/sdricoh_cs.c
Diff comments   View file @ ac8b422
... ... @@ -30,7 +30,6 @@
30 30 #include <linux/ioport.h>
31 31 #include <linux/scatterlist.h>
32 32  
33   -#include <pcmcia/cs_types.h>
34 33 #include <pcmcia/cs.h>
35 34 #include <pcmcia/cistpl.h>
36 35 #include <pcmcia/ds.h>
drivers/mtd/maps/pcmciamtd.c
Diff comments   View file @ ac8b422
... ... @@ -16,7 +16,6 @@
16 16 #include <asm/io.h>
17 17 #include <asm/system.h>
18 18  
19   -#include <pcmcia/cs_types.h>
20 19 #include <pcmcia/cs.h>
21 20 #include <pcmcia/cistpl.h>
22 21 #include <pcmcia/ds.h>
drivers/net/pcmcia/3c574_cs.c
Diff comments   View file @ ac8b422
... ... @@ -87,7 +87,6 @@
87 87 #include <linux/bitops.h>
88 88 #include <linux/mii.h>
89 89  
90   -#include <pcmcia/cs_types.h>
91 90 #include <pcmcia/cs.h>
92 91 #include <pcmcia/cistpl.h>
93 92 #include <pcmcia/cisreg.h>
drivers/net/pcmcia/3c589_cs.c
Diff comments   View file @ ac8b422
... ... @@ -41,7 +41,6 @@
41 41 #include <linux/bitops.h>
42 42 #include <linux/jiffies.h>
43 43  
44   -#include <pcmcia/cs_types.h>
45 44 #include <pcmcia/cs.h>
46 45 #include <pcmcia/cistpl.h>
47 46 #include <pcmcia/cisreg.h>
drivers/net/pcmcia/axnet_cs.c
Diff comments   View file @ ac8b422
... ... @@ -39,7 +39,6 @@
39 39 #include <linux/mii.h>
40 40 #include "../8390.h"
41 41  
42   -#include <pcmcia/cs_types.h>
43 42 #include <pcmcia/cs.h>
44 43 #include <pcmcia/cistpl.h>
45 44 #include <pcmcia/ciscode.h>
drivers/net/pcmcia/com20020_cs.c
Diff comments   View file @ ac8b422
... ... @@ -43,7 +43,6 @@
43 43 #include <linux/arcdevice.h>
44 44 #include <linux/com20020.h>
45 45  
46   -#include <pcmcia/cs_types.h>
47 46 #include <pcmcia/cs.h>
48 47 #include <pcmcia/cistpl.h>
49 48 #include <pcmcia/ds.h>
drivers/net/pcmcia/fmvj18x_cs.c
Diff comments   View file @ ac8b422
... ... @@ -49,7 +49,6 @@
49 49 #include <linux/ioport.h>
50 50 #include <linux/crc32.h>
51 51  
52   -#include <pcmcia/cs_types.h>
53 52 #include <pcmcia/cs.h>
54 53 #include <pcmcia/cistpl.h>
55 54 #include <pcmcia/ciscode.h>
drivers/net/pcmcia/ibmtr_cs.c
Diff comments   View file @ ac8b422
... ... @@ -57,7 +57,6 @@
57 57 #include <linux/trdevice.h>
58 58 #include <linux/ibmtr.h>
59 59  
60   -#include <pcmcia/cs_types.h>
61 60 #include <pcmcia/cs.h>
62 61 #include <pcmcia/cistpl.h>
63 62 #include <pcmcia/ds.h>
drivers/net/pcmcia/nmclan_cs.c
Diff comments   View file @ ac8b422
... ... @@ -146,7 +146,6 @@
146 146 #include <linux/ioport.h>
147 147 #include <linux/bitops.h>
148 148  
149   -#include <pcmcia/cs_types.h>
150 149 #include <pcmcia/cs.h>
151 150 #include <pcmcia/cisreg.h>
152 151 #include <pcmcia/cistpl.h>
drivers/net/pcmcia/pcnet_cs.c
Diff comments   View file @ ac8b422
... ... @@ -42,7 +42,6 @@
42 42 #include <linux/mii.h>
43 43 #include "../8390.h"
44 44  
45   -#include <pcmcia/cs_types.h>
46 45 #include <pcmcia/cs.h>
47 46 #include <pcmcia/cistpl.h>
48 47 #include <pcmcia/ciscode.h>
... ... @@ -113,8 +112,6 @@
113 112  
114 113 static void pcnet_detach(struct pcmcia_device *p_dev);
115 114  
116   -static dev_info_t dev_info = "pcnet_cs";
117   -
118 115 /*====================================================================*/
119 116  
120 117 typedef struct hw_info_t {
... ... @@ -956,7 +953,7 @@
956 953 set_misc_reg(dev);
957 954  
958 955 outb_p(0xFF, nic_base + EN0_ISR); /* Clear bogus intr. */
959   - ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, dev_info, dev);
  956 + ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, dev->name, dev);
960 957 if (ret)
961 958 return ret;
962 959  
drivers/net/pcmcia/smc91c92_cs.c
Diff comments   View file @ ac8b422
... ... @@ -44,7 +44,6 @@
44 44 #include <linux/jiffies.h>
45 45 #include <linux/firmware.h>
46 46  
47   -#include <pcmcia/cs_types.h>
48 47 #include <pcmcia/cs.h>
49 48 #include <pcmcia/cistpl.h>
50 49 #include <pcmcia/cisreg.h>
drivers/net/pcmcia/xirc2ps_cs.c
Diff comments   View file @ ac8b422
... ... @@ -82,7 +82,6 @@
82 82 #include <linux/bitops.h>
83 83 #include <linux/mii.h>
84 84  
85   -#include <pcmcia/cs_types.h>
86 85 #include <pcmcia/cs.h>
87 86 #include <pcmcia/cistpl.h>
88 87 #include <pcmcia/cisreg.h>
drivers/net/wireless/airo_cs.c
Diff comments   View file @ ac8b422
... ... @@ -32,7 +32,6 @@
32 32 #include <linux/timer.h>
33 33 #include <linux/netdevice.h>
34 34  
35   -#include <pcmcia/cs_types.h>
36 35 #include <pcmcia/cs.h>
37 36 #include <pcmcia/cistpl.h>
38 37 #include <pcmcia/cisreg.h>
drivers/net/wireless/atmel_cs.c
Diff comments   View file @ ac8b422
... ... @@ -42,7 +42,6 @@
42 42 #include <linux/moduleparam.h>
43 43 #include <linux/device.h>
44 44  
45   -#include <pcmcia/cs_types.h>
46 45 #include <pcmcia/cs.h>
47 46 #include <pcmcia/cistpl.h>
48 47 #include <pcmcia/cisreg.h>
drivers/net/wireless/b43/pcmcia.c
Diff comments   View file @ ac8b422
... ... @@ -26,7 +26,6 @@
26 26 #include <linux/ssb/ssb.h>
27 27 #include <linux/slab.h>
28 28  
29   -#include <pcmcia/cs_types.h>
30 29 #include <pcmcia/cs.h>
31 30 #include <pcmcia/cistpl.h>
32 31 #include <pcmcia/ciscode.h>
drivers/net/wireless/hostap/hostap_cs.c
Diff comments   View file @ ac8b422
... ... @@ -12,7 +12,6 @@
12 12 #include <linux/wireless.h>
13 13 #include <net/iw_handler.h>
14 14  
15   -#include <pcmcia/cs_types.h>
16 15 #include <pcmcia/cs.h>
17 16 #include <pcmcia/cistpl.h>
18 17 #include <pcmcia/cisreg.h>
... ... @@ -23,7 +22,7 @@
23 22 #include "hostap_wlan.h"
24 23  
25 24  
26   -static dev_info_t dev_info = "hostap_cs";
  25 +static char *dev_info = "hostap_cs";
27 26  
28 27 MODULE_AUTHOR("Jouni Malinen");
29 28 MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "
drivers/net/wireless/libertas/if_cs.c
Diff comments   View file @ ac8b422
... ... @@ -28,7 +28,6 @@
28 28 #include <linux/firmware.h>
29 29 #include <linux/netdevice.h>
30 30  
31   -#include <pcmcia/cs_types.h>
32 31 #include <pcmcia/cs.h>
33 32 #include <pcmcia/cistpl.h>
34 33 #include <pcmcia/ds.h>
drivers/net/wireless/orinoco/orinoco_cs.c
Diff comments   View file @ ac8b422
... ... @@ -17,7 +17,6 @@
17 17 #include <linux/kernel.h>
18 18 #include <linux/init.h>
19 19 #include <linux/delay.h>
20   -#include <pcmcia/cs_types.h>
21 20 #include <pcmcia/cs.h>
22 21 #include <pcmcia/cistpl.h>
23 22 #include <pcmcia/cisreg.h>
drivers/net/wireless/orinoco/spectrum_cs.c
Diff comments   View file @ ac8b422
... ... @@ -25,7 +25,6 @@
25 25 #include <linux/kernel.h>
26 26 #include <linux/init.h>
27 27 #include <linux/delay.h>
28   -#include <pcmcia/cs_types.h>
29 28 #include <pcmcia/cs.h>
30 29 #include <pcmcia/cistpl.h>
31 30 #include <pcmcia/cisreg.h>
drivers/net/wireless/ray_cs.c
Diff comments   View file @ ac8b422
... ... @@ -46,7 +46,6 @@
46 46 #include <linux/ethtool.h>
47 47 #include <linux/ieee80211.h>
48 48  
49   -#include <pcmcia/cs_types.h>
50 49 #include <pcmcia/cs.h>
51 50 #include <pcmcia/cistpl.h>
52 51 #include <pcmcia/cisreg.h>
drivers/net/wireless/wl3501_cs.c
Diff comments   View file @ ac8b422
... ... @@ -48,7 +48,6 @@
48 48  
49 49 #include <net/iw_handler.h>
50 50  
51   -#include <pcmcia/cs_types.h>
52 51 #include <pcmcia/cs.h>
53 52 #include <pcmcia/cistpl.h>
54 53 #include <pcmcia/cisreg.h>
... ... @@ -89,13 +88,6 @@
89 88 static int wl3501_config(struct pcmcia_device *link);
90 89 static void wl3501_release(struct pcmcia_device *link);
91 90  
92   -/*
93   - * The dev_info variable is the "key" that is used to match up this
94   - * device driver with appropriate cards, through the card configuration
95   - * database.
96   - */
97   -static dev_info_t wl3501_dev_info = "wl3501_cs";
98   -
99 91 static const struct {
100 92 int reg_domain;
101 93 int min, max, deflt;
... ... @@ -1421,7 +1413,7 @@
1421 1413  
1422 1414 static void wl3501_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
1423 1415 {
1424   - strlcpy(info->driver, wl3501_dev_info, sizeof(info->driver));
  1416 + strlcpy(info->driver, "wl3501_cs", sizeof(info->driver));
1425 1417 }
1426 1418  
1427 1419 static const struct ethtool_ops ops = {
drivers/parport/parport_cs.c
Diff comments   View file @ ac8b422
... ... @@ -48,7 +48,6 @@
48 48 #include <linux/parport.h>
49 49 #include <linux/parport_pc.h>
50 50  
51   -#include <pcmcia/cs_types.h>
52 51 #include <pcmcia/cs.h>
53 52 #include <pcmcia/cistpl.h>
54 53 #include <pcmcia/ds.h>
drivers/pcmcia/au1000_generic.h
Diff comments   View file @ ac8b422
... ... @@ -23,7 +23,6 @@
23 23  
24 24 /* include the world */
25 25  
26   -#include <pcmcia/cs_types.h>
27 26 #include <pcmcia/cs.h>
28 27 #include <pcmcia/ss.h>
29 28 #include <pcmcia/cistpl.h>
drivers/pcmcia/au1000_pb1x00.c
Diff comments   View file @ ac8b422
... ... @@ -31,11 +31,9 @@
31 31 #include <linux/proc_fs.h>
32 32 #include <linux/types.h>
33 33  
34   -#include <pcmcia/cs_types.h>
35 34 #include <pcmcia/cs.h>
36 35 #include <pcmcia/ss.h>
37 36 #include <pcmcia/cistpl.h>
38   -#include <pcmcia/bus_ops.h>
39 37  
40 38 #include <asm/io.h>
41 39 #include <asm/irq.h>
drivers/pcmcia/cistpl.c
Diff comments   View file @ ac8b422
... ... @@ -27,7 +27,6 @@
27 27 #include <asm/byteorder.h>
28 28 #include <asm/unaligned.h>
29 29  
30   -#include <pcmcia/cs_types.h>
31 30 #include <pcmcia/ss.h>
32 31 #include <pcmcia/cs.h>
33 32 #include <pcmcia/cisreg.h>
... ... @@ -32,7 +32,6 @@
32 32 #include <asm/system.h>
33 33 #include <asm/irq.h>
34 34  
35   -#include <pcmcia/cs_types.h>
36 35 #include <pcmcia/ss.h>
37 36 #include <pcmcia/cs.h>
38 37 #include <pcmcia/cistpl.h>
drivers/pcmcia/db1xxx_ss.c
Diff comments   View file @ ac8b422
... ... @@ -29,7 +29,6 @@
29 29 #include <linux/slab.h>
30 30 #include <linux/spinlock.h>
31 31  
32   -#include <pcmcia/cs_types.h>
33 32 #include <pcmcia/ss.h>
34 33  
35 34 #include <asm/mach-au1x00/au1000.h>
... ... @@ -26,7 +26,6 @@
26 26 #include <linux/dma-mapping.h>
27 27 #include <linux/slab.h>
28 28  
29   -#include <pcmcia/cs_types.h>
30 29 #include <pcmcia/cs.h>
31 30 #include <pcmcia/cistpl.h>
32 31 #include <pcmcia/ds.h>
drivers/pcmcia/i82092.c
Diff comments   View file @ ac8b422
... ... @@ -15,7 +15,6 @@
15 15 #include <linux/interrupt.h>
16 16 #include <linux/device.h>
17 17  
18   -#include <pcmcia/cs_types.h>
19 18 #include <pcmcia/ss.h>
20 19 #include <pcmcia/cs.h>
21 20  
drivers/pcmcia/i82365.c
Diff comments   View file @ ac8b422
... ... @@ -50,7 +50,6 @@
50 50 #include <asm/io.h>
51 51 #include <asm/system.h>
52 52  
53   -#include <pcmcia/cs_types.h>
54 53 #include <pcmcia/ss.h>
55 54 #include <pcmcia/cs.h>
56 55  
drivers/pcmcia/m32r_cfc.c
Diff comments   View file @ ac8b422
... ... @@ -26,7 +26,6 @@
26 26 #include <asm/io.h>
27 27 #include <asm/system.h>
28 28  
29   -#include <pcmcia/cs_types.h>
30 29 #include <pcmcia/ss.h>
31 30 #include <pcmcia/cs.h>
32 31  
drivers/pcmcia/m32r_pcc.c
Diff comments   View file @ ac8b422
... ... @@ -27,7 +27,6 @@
27 27 #include <asm/system.h>
28 28 #include <asm/addrspace.h>
29 29  
30   -#include <pcmcia/cs_types.h>
31 30 #include <pcmcia/ss.h>
32 31 #include <pcmcia/cs.h>
33 32  
drivers/pcmcia/m8xx_pcmcia.c
Diff comments   View file @ ac8b422
... ... @@ -59,7 +59,6 @@
59 59 #include <asm/irq.h>
60 60 #include <asm/fs_pd.h>
61 61  
62   -#include <pcmcia/cs_types.h>
63 62 #include <pcmcia/cs.h>
64 63 #include <pcmcia/ss.h>
65 64  
drivers/pcmcia/pcmcia_cis.c
Diff comments   View file @ ac8b422
... ... @@ -19,7 +19,6 @@
19 19 #include <linux/kernel.h>
20 20 #include <linux/netdevice.h>
21 21  
22   -#include <pcmcia/cs_types.h>
23 22 #include <pcmcia/cisreg.h>
24 23 #include <pcmcia/cistpl.h>
25 24 #include <pcmcia/ss.h>
drivers/pcmcia/pcmcia_resource.c
Diff comments   View file @ ac8b422
... ... @@ -25,7 +25,6 @@
25 25  
26 26 #include <asm/irq.h>
27 27  
28   -#include <pcmcia/cs_types.h>
29 28 #include <pcmcia/ss.h>
30 29 #include <pcmcia/cs.h>
31 30 #include <pcmcia/cistpl.h>
drivers/pcmcia/pd6729.c
Diff comments   View file @ ac8b422
... ... @@ -17,7 +17,6 @@
17 17 #include <linux/device.h>
18 18 #include <linux/io.h>
19 19  
20   -#include <pcmcia/cs_types.h>
21 20 #include <pcmcia/ss.h>
22 21 #include <pcmcia/cs.h>
23 22  
drivers/pcmcia/pxa2xx_base.c
Diff comments   View file @ ac8b422
... ... @@ -32,7 +32,6 @@
32 32 #include <mach/pxa2xx-regs.h>
33 33 #include <asm/mach-types.h>
34 34  
35   -#include <pcmcia/cs_types.h>
36 35 #include <pcmcia/ss.h>
37 36 #include <pcmcia/cistpl.h>
38 37  
drivers/pcmcia/rsrc_iodyn.c
Diff comments   View file @ ac8b422
... ... @@ -16,7 +16,6 @@
16 16 #include <linux/module.h>
17 17 #include <linux/kernel.h>
18 18  
19   -#include <pcmcia/cs_types.h>
20 19 #include <pcmcia/ss.h>
21 20 #include <pcmcia/cs.h>
22 21 #include <pcmcia/cistpl.h>
drivers/pcmcia/rsrc_mgr.c
Diff comments   View file @ ac8b422
... ... @@ -16,7 +16,6 @@
16 16 #include <linux/module.h>
17 17 #include <linux/kernel.h>
18 18  
19   -#include <pcmcia/cs_types.h>
20 19 #include <pcmcia/ss.h>
21 20 #include <pcmcia/cs.h>
22 21 #include <pcmcia/cistpl.h>
drivers/pcmcia/rsrc_nonstatic.c
Diff comments   View file @ ac8b422
... ... @@ -28,7 +28,6 @@
28 28  
29 29 #include <asm/irq.h>
30 30  
31   -#include <pcmcia/cs_types.h>
32 31 #include <pcmcia/ss.h>
33 32 #include <pcmcia/cs.h>
34 33 #include <pcmcia/cistpl.h>
drivers/pcmcia/sa1100_generic.c
Diff comments   View file @ ac8b422
... ... @@ -35,7 +35,6 @@
35 35 #include <linux/slab.h>
36 36 #include <linux/platform_device.h>
37 37  
38   -#include <pcmcia/cs_types.h>
39 38 #include <pcmcia/cs.h>
40 39 #include <pcmcia/ss.h>
41 40  
drivers/pcmcia/soc_common.h
Diff comments   View file @ ac8b422
... ... @@ -11,7 +11,6 @@
11 11  
12 12 /* include the world */
13 13 #include <linux/cpufreq.h>
14   -#include <pcmcia/cs_types.h>
15 14 #include <pcmcia/cs.h>
16 15 #include <pcmcia/ss.h>
17 16 #include <pcmcia/cistpl.h>
drivers/pcmcia/socket_sysfs.c
Diff comments   View file @ ac8b422
... ... @@ -26,7 +26,6 @@
26 26 #include <asm/system.h>
27 27 #include <asm/irq.h>
28 28  
29   -#include <pcmcia/cs_types.h>
30 29 #include <pcmcia/ss.h>
31 30 #include <pcmcia/cs.h>
32 31 #include <pcmcia/cistpl.h>
drivers/pcmcia/tcic.c
Diff comments   View file @ ac8b422
... ... @@ -49,7 +49,6 @@
49 49 #include <asm/io.h>
50 50 #include <asm/system.h>
51 51  
52   -#include <pcmcia/cs_types.h>
53 52 #include <pcmcia/cs.h>
54 53 #include <pcmcia/ss.h>
55 54 #include "tcic.h"
drivers/pcmcia/xxs1500_ss.c
Diff comments   View file @ ac8b422
... ... @@ -17,7 +17,6 @@
17 17 #include <linux/slab.h>
18 18 #include <linux/spinlock.h>
19 19  
20   -#include <pcmcia/cs_types.h>
21 20 #include <pcmcia/cs.h>
22 21 #include <pcmcia/ss.h>
23 22 #include <pcmcia/cistpl.h>
drivers/pcmcia/yenta_socket.c
Diff comments   View file @ ac8b422
... ... @@ -19,7 +19,6 @@
19 19 #include <linux/io.h>
20 20 #include <linux/slab.h>
21 21  
22   -#include <pcmcia/cs_types.h>
23 22 #include <pcmcia/ss.h>
24 23 #include <pcmcia/cs.h>
25 24  
drivers/scsi/pcmcia/aha152x_stub.c
Diff comments   View file @ ac8b422
... ... @@ -49,7 +49,6 @@
49 49 #include <scsi/scsi_host.h>
50 50 #include "aha152x.h"
51 51  
52   -#include <pcmcia/cs_types.h>
53 52 #include <pcmcia/cs.h>
54 53 #include <pcmcia/cistpl.h>
55 54 #include <pcmcia/ds.h>
drivers/scsi/pcmcia/fdomain_stub.c
Diff comments   View file @ ac8b422
... ... @@ -46,7 +46,6 @@
46 46 #include <scsi/scsi_host.h>
47 47 #include "fdomain.h"
48 48  
49   -#include <pcmcia/cs_types.h>
50 49 #include <pcmcia/cs.h>
51 50 #include <pcmcia/cistpl.h>
52 51 #include <pcmcia/ds.h>
drivers/scsi/pcmcia/nsp_cs.c
Diff comments   View file @ ac8b422
... ... @@ -47,7 +47,6 @@
47 47 #include <scsi/scsi.h>
48 48 #include <scsi/scsi_ioctl.h>
49 49  
50   -#include <pcmcia/cs_types.h>
51 50 #include <pcmcia/cs.h>
52 51 #include <pcmcia/cistpl.h>
53 52 #include <pcmcia/cisreg.h>
drivers/scsi/pcmcia/qlogic_stub.c
Diff comments   View file @ ac8b422
... ... @@ -48,7 +48,6 @@
48 48 #include <scsi/scsi_host.h>
49 49 #include "../qlogicfas408.h"
50 50  
51   -#include <pcmcia/cs_types.h>
52 51 #include <pcmcia/cs.h>
53 52 #include <pcmcia/cistpl.h>
54 53 #include <pcmcia/ds.h>
drivers/scsi/pcmcia/sym53c500_cs.c
Diff comments   View file @ ac8b422
... ... @@ -71,7 +71,6 @@
71 71 #include <scsi/scsi.h>
72 72 #include <scsi/scsi_host.h>
73 73  
74   -#include <pcmcia/cs_types.h>
75 74 #include <pcmcia/cs.h>
76 75 #include <pcmcia/cistpl.h>
77 76 #include <pcmcia/ds.h>
drivers/serial/serial_cs.c
Diff comments   View file @ ac8b422
... ... @@ -45,7 +45,6 @@
45 45 #include <asm/io.h>
46 46 #include <asm/system.h>
47 47  
48   -#include <pcmcia/cs_types.h>
49 48 #include <pcmcia/cs.h>
50 49 #include <pcmcia/cistpl.h>
51 50 #include <pcmcia/ciscode.h>
... ... @@ -20,7 +20,6 @@
20 20 #include <linux/mmc/sdio_func.h>
21 21 #include <linux/slab.h>
22 22  
23   -#include <pcmcia/cs_types.h>
24 23 #include <pcmcia/cs.h>
25 24 #include <pcmcia/cistpl.h>
26 25 #include <pcmcia/ds.h>
drivers/ssb/pcmcia.c
Diff comments   View file @ ac8b422
... ... @@ -13,7 +13,6 @@
13 13 #include <linux/io.h>
14 14 #include <linux/etherdevice.h>
15 15  
16   -#include <pcmcia/cs_types.h>
17 16 #include <pcmcia/cs.h>
18 17 #include <pcmcia/cistpl.h>
19 18 #include <pcmcia/ciscode.h>
... ... @@ -17,7 +17,6 @@
17 17 #include <linux/pci.h>
18 18 #include <linux/io.h>
19 19  
20   -#include <pcmcia/cs_types.h>
21 20 #include <pcmcia/cs.h>
22 21 #include <pcmcia/cistpl.h>
23 22 #include <pcmcia/ds.h>
drivers/staging/comedi/drivers/cb_das16_cs.c
Diff comments   View file @ ac8b422
... ... @@ -37,7 +37,6 @@
37 37 #include <linux/delay.h>
38 38 #include <linux/pci.h>
39 39  
40   -#include <pcmcia/cs_types.h>
41 40 #include <pcmcia/cs.h>
42 41 #include <pcmcia/cistpl.h>
43 42 #include <pcmcia/ds.h>
drivers/staging/comedi/drivers/das08_cs.c
Diff comments   View file @ ac8b422
... ... @@ -48,7 +48,6 @@
48 48 #include "das08.h"
49 49  
50 50 /* pcmcia includes */
51   -#include <pcmcia/cs_types.h>
52 51 #include <pcmcia/cs.h>
53 52 #include <pcmcia/cistpl.h>
54 53 #include <pcmcia/ds.h>
drivers/staging/comedi/drivers/ni_daq_700.c
Diff comments   View file @ ac8b422
... ... @@ -47,7 +47,6 @@
47 47  
48 48 #include <linux/ioport.h>
49 49  
50   -#include <pcmcia/cs_types.h>
51 50 #include <pcmcia/cs.h>
52 51 #include <pcmcia/cistpl.h>
53 52 #include <pcmcia/cisreg.h>
drivers/staging/comedi/drivers/ni_daq_dio24.c
Diff comments   View file @ ac8b422
... ... @@ -48,7 +48,6 @@
48 48  
49 49 #include "8255.h"
50 50  
51   -#include <pcmcia/cs_types.h>
52 51 #include <pcmcia/cs.h>
53 52 #include <pcmcia/cistpl.h>
54 53 #include <pcmcia/cisreg.h>
drivers/staging/comedi/drivers/ni_labpc_cs.c
Diff comments   View file @ ac8b422
... ... @@ -71,7 +71,6 @@
71 71 #include "comedi_fc.h"
72 72 #include "ni_labpc.h"
73 73  
74   -#include <pcmcia/cs_types.h>
75 74 #include <pcmcia/cs.h>
76 75 #include <pcmcia/cistpl.h>
77 76 #include <pcmcia/cisreg.h>
drivers/staging/comedi/drivers/ni_mio_cs.c
Diff comments   View file @ ac8b422
... ... @@ -48,7 +48,6 @@
48 48 #include "ni_stc.h"
49 49 #include "8255.h"
50 50  
51   -#include <pcmcia/cs_types.h>
52 51 #include <pcmcia/cs.h>
53 52 #include <pcmcia/cistpl.h>
54 53 #include <pcmcia/ds.h>
drivers/staging/comedi/drivers/quatech_daqp_cs.c
Diff comments   View file @ ac8b422
... ... @@ -50,7 +50,6 @@
50 50 #include "../comedidev.h"
51 51 #include <linux/semaphore.h>
52 52  
53   -#include <pcmcia/cs_types.h>
54 53 #include <pcmcia/cs.h>
55 54 #include <pcmcia/cistpl.h>
56 55 #include <pcmcia/cisreg.h>
drivers/staging/wlags49_h2/wl_cs.c
Diff comments   View file @ ac8b422
... ... @@ -83,7 +83,6 @@
83 83 #include <linux/if_arp.h>
84 84 #include <linux/ioport.h>
85 85  
86   -#include <pcmcia/cs_types.h>
87 86 #include <pcmcia/cs.h>
88 87 #include <pcmcia/cistpl.h>
89 88 #include <pcmcia/cisreg.h>
drivers/staging/wlags49_h2/wl_internal.h
Diff comments   View file @ ac8b422
... ... @@ -69,7 +69,6 @@
69 69 ******************************************************************************/
70 70 #include <linux/version.h>
71 71 #ifdef BUS_PCMCIA
72   -#include <pcmcia/cs_types.h>
73 72 #include <pcmcia/cs.h>
74 73 #include <pcmcia/cistpl.h>
75 74 #include <pcmcia/cisreg.h>
drivers/telephony/ixj_pcmcia.c
Diff comments   View file @ ac8b422
... ... @@ -8,7 +8,6 @@
8 8 #include <linux/errno.h> /* error codes */
9 9 #include <linux/slab.h>
10 10  
11   -#include <pcmcia/cs_types.h>
12 11 #include <pcmcia/cs.h>
13 12 #include <pcmcia/cistpl.h>
14 13 #include <pcmcia/ds.h>
drivers/usb/host/sl811_cs.c
Diff comments   View file @ ac8b422
... ... @@ -20,7 +20,6 @@
20 20 #include <linux/ioport.h>
21 21 #include <linux/platform_device.h>
22 22  
23   -#include <pcmcia/cs_types.h>
24 23 #include <pcmcia/cs.h>
25 24 #include <pcmcia/cistpl.h>
26 25 #include <pcmcia/cisreg.h>
... ... @@ -43,8 +42,6 @@
43 42 /* VARIABLES */
44 43 /*====================================================================*/
45 44  
46   -static const char driver_name[DEV_NAME_LEN] = "sl811_cs";
47   -
48 45 typedef struct local_info_t {
49 46 struct pcmcia_device *p_dev;
50 47 } local_info_t;
... ... @@ -246,7 +243,7 @@
246 243 static struct pcmcia_driver sl811_cs_driver = {
247 244 .owner = THIS_MODULE,
248 245 .drv = {
249   - .name = (char *)driver_name,
  246 + .name = "sl811_cs",
250 247 },
251 248 .probe = sl811_cs_probe,
252 249 .remove = sl811_cs_detach,
include/pcmcia/cistpl.h
Diff comments   View file @ ac8b422
... ... @@ -15,6 +15,8 @@
15 15 #ifndef _LINUX_CISTPL_H
16 16 #define _LINUX_CISTPL_H
17 17  
  18 +typedef unsigned char cisdata_t;
  19 +
18 20 #define CISTPL_NULL 0x00
19 21 #define CISTPL_DEVICE 0x01
20 22 #define CISTPL_LONGLINK_CB 0x02
... ... @@ -43,14 +43,6 @@
43 43 #define CV_COPY_VALUE 0x08
44 44 #define CV_EXT_STATUS 0x10
45 45  
46   -/* For GetFirst/NextClient */
47   -typedef struct client_req_t {
48   - socket_t Socket;
49   - u_int Attributes;
50   -} client_req_t;
51   -
52   -#define CLIENT_THIS_SOCKET 0x01
53   -
54 46 /* ModifyConfiguration */
55 47 typedef struct modconf_t {
56 48 u_int Attributes;
... ... @@ -133,7 +125,7 @@
133 125 /* For GetMemPage, MapMemPage */
134 126 typedef struct memreq_t {
135 127 u_int CardOffset;
136   - page_t Page;
  128 + u_short Page;
137 129 } memreq_t;
138 130  
139 131 /* For ModifyWindow */
include/pcmcia/cs_types.h
View file @ ac8b422
1   -/*
2   - * cs_types.h
3   - *
4   - * This program is free software; you can redistribute it and/or modify
5   - * it under the terms of the GNU General Public License version 2 as
6   - * published by the Free Software Foundation.
7   - *
8   - * The initial developer of the original code is David A. Hinds
9   - * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
10   - * are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
11   - *
12   - * (C) 1999 David A. Hinds
13   - */
14   -
15   -#ifndef _LINUX_CS_TYPES_H
16   -#define _LINUX_CS_TYPES_H
17   -
18   -#ifdef __KERNEL__
19   -#include <linux/types.h>
20   -#else
21   -#include <sys/types.h>
22   -#endif
23   -
24   -typedef u_short socket_t;
25   -typedef u_int event_t;
26   -typedef u_char cisdata_t;
27   -typedef u_short page_t;
28   -
29   -typedef unsigned long window_handle_t;
30   -
31   -struct region_t;
32   -typedef struct region_t *memory_handle_t;
33   -
34   -#ifndef DEV_NAME_LEN
35   -#define DEV_NAME_LEN 32
36   -#endif
37   -
38   -typedef char dev_info_t[DEV_NAME_LEN];
39   -
40   -#endif /* _LINUX_CS_TYPES_H */
... ... @@ -20,7 +20,6 @@
20 20 #include <linux/mod_devicetable.h>
21 21 #endif
22 22  
23   -#include <pcmcia/cs_types.h>
24 23 #include <pcmcia/device_id.h>
25 24  
26 25 #ifdef __KERNEL__
... ... @@ -36,6 +35,8 @@
36 35 struct pcmcia_device;
37 36 struct config_t;
38 37 struct net_device;
  38 +
  39 +typedef unsigned long window_handle_t;
39 40  
40 41 /* dynamic device IDs for PCMCIA device drivers. See
41 42 * Documentation/pcmcia/driver.txt for details.
... ... @@ -19,7 +19,6 @@
19 19 #include <linux/sched.h> /* task_struct, completion */
20 20 #include <linux/mutex.h>
21 21  
22   -#include <pcmcia/cs_types.h>
23 22 #include <pcmcia/cs.h>
24 23 #ifdef CONFIG_CARDBUS
25 24 #include <linux/pci.h>
sound/pcmcia/pdaudiocf/pdaudiocf.h
Diff comments   View file @ ac8b422
... ... @@ -24,7 +24,6 @@
24 24 #include <sound/pcm.h>
25 25 #include <asm/io.h>
26 26 #include <linux/interrupt.h>
27   -#include <pcmcia/cs_types.h>
28 27 #include <pcmcia/cs.h>
29 28 #include <pcmcia/cistpl.h>
30 29 #include <pcmcia/ds.h>
sound/pcmcia/vx/vxpocket.h
Diff comments   View file @ ac8b422
... ... @@ -23,7 +23,6 @@
23 23  
24 24 #include <sound/vx_core.h>
25 25  
26   -#include <pcmcia/cs_types.h>
27 26 #include <pcmcia/cs.h>
28 27 #include <pcmcia/cistpl.h>
29 28 #include <pcmcia/ds.h>