tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Dominik Brodowski ac8b4228 ce3f9d71

+14 -151
+5
Documentation/pcmcia/driver-changes.txt
··· 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
-1
drivers/ata/pata_pcmcia.c
··· 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>
-1
drivers/bluetooth/bluecard_cs.c
··· 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>
-1
drivers/bluetooth/bt3c_cs.c
··· 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>
-1
drivers/bluetooth/btuart_cs.c
··· 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>
-1
drivers/bluetooth/dtl1_cs.c
··· 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>
-1
drivers/char/pcmcia/cm4000_cs.c
··· 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>
-1
drivers/char/pcmcia/cm4040_cs.c
··· 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>
-1
drivers/char/pcmcia/ipwireless/main.h
··· 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>
-1
drivers/char/pcmcia/ipwireless/tty.h
··· 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>
-1
drivers/ide/ide-cs.c
··· 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>
-1
drivers/isdn/hardware/avm/avm_cs.c
··· 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>
-1
drivers/isdn/hisax/avma1_cs.c
··· 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>
-1
drivers/isdn/hisax/elsa_cs.c
··· 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>
-1
drivers/isdn/hisax/sedlbauer_cs.c
··· 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>
-1
drivers/isdn/hisax/teles_cs.c
··· 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>
-1
drivers/mmc/host/sdricoh_cs.c
··· 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>
-1
drivers/mtd/maps/pcmciamtd.c
··· 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>
-1
drivers/net/pcmcia/3c574_cs.c
··· 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>
-1
drivers/net/pcmcia/3c589_cs.c
··· 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>
-1
drivers/net/pcmcia/axnet_cs.c
··· 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>
-1
drivers/net/pcmcia/com20020_cs.c
··· 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>
-1
drivers/net/pcmcia/fmvj18x_cs.c
··· 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>
-1
drivers/net/pcmcia/ibmtr_cs.c
··· 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>
-1
drivers/net/pcmcia/nmclan_cs.c
··· 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>
+1 -4
drivers/net/pcmcia/pcnet_cs.c
··· 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> ··· 111 112 int stop_pg); 112 113 113 114 static void pcnet_detach(struct pcmcia_device *p_dev); 114 - 115 - static dev_info_t dev_info = "pcnet_cs"; 116 115 117 116 /*====================================================================*/ 118 117 ··· 953 956 set_misc_reg(dev); 954 957 955 958 outb_p(0xFF, nic_base + EN0_ISR); /* Clear bogus intr. */ 956 - ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, dev_info, dev); 959 + ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, dev->name, dev); 957 960 if (ret) 958 961 return ret; 959 962
-1
drivers/net/pcmcia/smc91c92_cs.c
··· 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>
-1
drivers/net/pcmcia/xirc2ps_cs.c
··· 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>
-1
drivers/net/wireless/airo_cs.c
··· 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>
-1
drivers/net/wireless/atmel_cs.c
··· 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>
-1
drivers/net/wireless/b43/pcmcia.c
··· 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>
+1 -2
drivers/net/wireless/hostap/hostap_cs.c
··· 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> ··· 22 23 #include "hostap_wlan.h" 23 24 24 25 25 - static dev_info_t dev_info = "hostap_cs"; 26 + static char *dev_info = "hostap_cs"; 26 27 27 28 MODULE_AUTHOR("Jouni Malinen"); 28 29 MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "
-1
drivers/net/wireless/libertas/if_cs.c
··· 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>
-1
drivers/net/wireless/orinoco/orinoco_cs.c
··· 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>
-1
drivers/net/wireless/orinoco/spectrum_cs.c
··· 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>
-1
drivers/net/wireless/ray_cs.c
··· 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>
+1 -9
drivers/net/wireless/wl3501_cs.c
··· 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> ··· 87 88 */ 88 89 static int wl3501_config(struct pcmcia_device *link); 89 90 static void wl3501_release(struct pcmcia_device *link); 90 - 91 - /* 92 - * The dev_info variable is the "key" that is used to match up this 93 - * device driver with appropriate cards, through the card configuration 94 - * database. 95 - */ 96 - static dev_info_t wl3501_dev_info = "wl3501_cs"; 97 91 98 92 static const struct { 99 93 int reg_domain; ··· 1413 1421 1414 1422 static void wl3501_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 1415 1423 { 1416 - strlcpy(info->driver, wl3501_dev_info, sizeof(info->driver)); 1424 + strlcpy(info->driver, "wl3501_cs", sizeof(info->driver)); 1417 1425 } 1418 1426 1419 1427 static const struct ethtool_ops ops = {
-1
drivers/parport/parport_cs.c
··· 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>
-1
drivers/pcmcia/au1000_generic.h
··· 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>
-2
drivers/pcmcia/au1000_pb1x00.c
··· 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>
-1
drivers/pcmcia/cistpl.c
··· 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>
-1
drivers/pcmcia/cs.c
··· 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>
-1
drivers/pcmcia/db1xxx_ss.c
··· 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>
-1
drivers/pcmcia/ds.c
··· 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>
-1
drivers/pcmcia/i82092.c
··· 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
-1
drivers/pcmcia/i82365.c
··· 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
-1
drivers/pcmcia/m32r_cfc.c
··· 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
-1
drivers/pcmcia/m32r_pcc.c
··· 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
-1
drivers/pcmcia/m8xx_pcmcia.c
··· 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
-1
drivers/pcmcia/pcmcia_cis.c
··· 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>
-1
drivers/pcmcia/pcmcia_resource.c
··· 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>
-1
drivers/pcmcia/pd6729.c
··· 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
-1
drivers/pcmcia/pxa2xx_base.c
··· 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
-1
drivers/pcmcia/rsrc_iodyn.c
··· 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>
-1
drivers/pcmcia/rsrc_mgr.c
··· 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>
-1
drivers/pcmcia/rsrc_nonstatic.c
··· 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>
-1
drivers/pcmcia/sa1100_generic.c
··· 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
-1
drivers/pcmcia/soc_common.h
··· 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>
-1
drivers/pcmcia/socket_sysfs.c
··· 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>
-1
drivers/pcmcia/tcic.c
··· 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"
-1
drivers/pcmcia/xxs1500_ss.c
··· 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>
-1
drivers/pcmcia/yenta_socket.c
··· 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
-1
drivers/scsi/pcmcia/aha152x_stub.c
··· 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>
-1
drivers/scsi/pcmcia/fdomain_stub.c
··· 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>
-1
drivers/scsi/pcmcia/nsp_cs.c
··· 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>
-1
drivers/scsi/pcmcia/qlogic_stub.c
··· 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>
-1
drivers/scsi/pcmcia/sym53c500_cs.c
··· 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>
-1
drivers/serial/serial_cs.c
··· 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>
-1
drivers/ssb/main.c
··· 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>
-1
drivers/ssb/pcmcia.c
··· 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>
-1
drivers/ssb/scan.c
··· 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>
-1
drivers/staging/comedi/drivers/cb_das16_cs.c
··· 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>
-1
drivers/staging/comedi/drivers/das08_cs.c
··· 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>
-1
drivers/staging/comedi/drivers/ni_daq_700.c
··· 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>
-1
drivers/staging/comedi/drivers/ni_daq_dio24.c
··· 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>
-1
drivers/staging/comedi/drivers/ni_labpc_cs.c
··· 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>
-1
drivers/staging/comedi/drivers/ni_mio_cs.c
··· 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>
-1
drivers/staging/comedi/drivers/quatech_daqp_cs.c
··· 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>
-1
drivers/staging/wlags49_h2/wl_cs.c
··· 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>
-1
drivers/staging/wlags49_h2/wl_internal.h
··· 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>
-1
drivers/telephony/ixj_pcmcia.c
··· 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>
+1 -4
drivers/usb/host/sl811_cs.c
··· 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> ··· 41 42 /*====================================================================*/ 42 43 /* VARIABLES */ 43 44 /*====================================================================*/ 44 - 45 - static const char driver_name[DEV_NAME_LEN] = "sl811_cs"; 46 45 47 46 typedef struct local_info_t { 48 47 struct pcmcia_device *p_dev; ··· 243 246 static struct pcmcia_driver sl811_cs_driver = { 244 247 .owner = THIS_MODULE, 245 248 .drv = { 246 - .name = (char *)driver_name, 249 + .name = "sl811_cs", 247 250 }, 248 251 .probe = sl811_cs_probe, 249 252 .remove = sl811_cs_detach,
+2
include/pcmcia/cistpl.h
··· 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
+1 -9
include/pcmcia/cs.h
··· 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; ··· 125 133 /* For GetMemPage, MapMemPage */ 126 134 typedef struct memreq_t { 127 135 u_int CardOffset; 128 - page_t Page; 136 + u_short Page; 129 137 } memreq_t; 130 138 131 139 /* For ModifyWindow */
-40
include/pcmcia/cs_types.h
··· 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 */
+2 -1
include/pcmcia/ds.h
··· 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__ ··· 35 36 struct pcmcia_device; 36 37 struct config_t; 37 38 struct net_device; 39 + 40 + typedef unsigned long window_handle_t; 38 41 39 42 /* dynamic device IDs for PCMCIA device drivers. See 40 43 * Documentation/pcmcia/driver.txt for details.
-1
include/pcmcia/ss.h
··· 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>
-1
sound/pcmcia/pdaudiocf/pdaudiocf.h
··· 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>
-1
sound/pcmcia/vx/vxpocket.h
··· 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>