Skip to content

Commit

Permalink
pcmcia: remove unused bulkmem.h
Browse files Browse the repository at this point in the history
The code in include/pcmcia/bulkmem.h was only kept for compatibility reasons.
Therefore, move the remaining region_info_t definition to ds.h

[[email protected]: do not modify the IOCTL, move definition to
 ds.h, and update changelog]
Signed-off-by: Magnus Damm <[email protected]>
Signed-off-by: Dominik Brodowski <[email protected]>
Magnus Damm authored and Dominik Brodowski committed Jun 24, 2008
1 parent c5081d5 commit ae49ec9
Showing 17 changed files with 18 additions and 71 deletions.
4 changes: 0 additions & 4 deletions drivers/mtd/ftl.c
Original file line number Diff line number Diff line change
@@ -130,10 +130,6 @@ typedef struct partition_t {
u_int16_t DataUnits;
u_int32_t BlocksPerUnit;
erase_unit_header_t header;
#if 0
region_info_t region;
memory_handle_t handle;
#endif
} partition_t;

/* Partition state flags */
1 change: 0 additions & 1 deletion drivers/pcmcia/au1000_generic.h
Original file line number Diff line number Diff line change
@@ -26,7 +26,6 @@
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
#include <pcmcia/ss.h>
#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include "cs_internal.h"

1 change: 0 additions & 1 deletion drivers/pcmcia/au1000_pb1x00.c
Original file line number Diff line number Diff line change
@@ -35,7 +35,6 @@
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
#include <pcmcia/ss.h>
#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include <pcmcia/bus_ops.h>
#include "cs_internal.h"
1 change: 0 additions & 1 deletion drivers/pcmcia/au1000_xxs1500.c
Original file line number Diff line number Diff line change
@@ -39,7 +39,6 @@
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
#include <pcmcia/ss.h>
#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include <pcmcia/bus_ops.h>
#include "cs_internal.h"
1 change: 0 additions & 1 deletion drivers/pcmcia/cardbus.c
Original file line number Diff line number Diff line change
@@ -34,7 +34,6 @@
#include <pcmcia/cs_types.h>
#include <pcmcia/ss.h>
#include <pcmcia/cs.h>
#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include "cs_internal.h"

1 change: 0 additions & 1 deletion drivers/pcmcia/cistpl.c
Original file line number Diff line number Diff line change
@@ -30,7 +30,6 @@
#include <pcmcia/cs_types.h>
#include <pcmcia/ss.h>
#include <pcmcia/cs.h>
#include <pcmcia/bulkmem.h>
#include <pcmcia/cisreg.h>
#include <pcmcia/cistpl.h>
#include "cs_internal.h"
1 change: 0 additions & 1 deletion drivers/pcmcia/cs.c
Original file line number Diff line number Diff line change
@@ -36,7 +36,6 @@
#include <pcmcia/cs_types.h>
#include <pcmcia/ss.h>
#include <pcmcia/cs.h>
#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include <pcmcia/cisreg.h>
#include <pcmcia/ds.h>
12 changes: 0 additions & 12 deletions drivers/pcmcia/cs_internal.h
Original file line number Diff line number Diff line change
@@ -26,18 +26,6 @@
#define CLIENT_WIN_REQ(i) (0x1<<(i))
#define CLIENT_CARDBUS 0x8000

#define REGION_MAGIC 0xE3C9
typedef struct region_t {
u_short region_magic;
u_short state;
dev_info_t dev_info;
struct pcmcia_device *mtd;
u_int MediaID;
region_info_t info;
} region_t;

#define REGION_STALE 0x01

/* Each card function gets one of these guys */
typedef struct config_t {
struct kref ref;
1 change: 0 additions & 1 deletion drivers/pcmcia/hd64465_ss.c
Original file line number Diff line number Diff line change
@@ -46,7 +46,6 @@
#include <pcmcia/cistpl.h>
#include <pcmcia/ds.h>
#include <pcmcia/ss.h>
#include <pcmcia/bulkmem.h>
#include "cs_internal.h"

#define MODNAME "hd64465_ss"
1 change: 0 additions & 1 deletion drivers/pcmcia/pcmcia_resource.c
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@
#include <pcmcia/cs_types.h>
#include <pcmcia/ss.h>
#include <pcmcia/cs.h>
#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include <pcmcia/cisreg.h>
#include <pcmcia/ds.h>
1 change: 0 additions & 1 deletion drivers/pcmcia/pxa2xx_base.c
Original file line number Diff line number Diff line change
@@ -33,7 +33,6 @@

#include <pcmcia/cs_types.h>
#include <pcmcia/ss.h>
#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>

#include "cs_internal.h"
1 change: 0 additions & 1 deletion drivers/pcmcia/rsrc_nonstatic.c
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@
#include <pcmcia/cs_types.h>
#include <pcmcia/ss.h>
#include <pcmcia/cs.h>
#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include "cs_internal.h"

1 change: 0 additions & 1 deletion drivers/pcmcia/soc_common.h
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
#include <pcmcia/ss.h>
#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include "cs_internal.h"

1 change: 0 additions & 1 deletion drivers/pcmcia/socket_sysfs.c
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@
#include <pcmcia/cs_types.h>
#include <pcmcia/ss.h>
#include <pcmcia/cs.h>
#include <pcmcia/bulkmem.h>
#include <pcmcia/cistpl.h>
#include <pcmcia/cisreg.h>
#include <pcmcia/ds.h>
41 changes: 0 additions & 41 deletions include/pcmcia/bulkmem.h

This file was deleted.

19 changes: 18 additions & 1 deletion include/pcmcia/ds.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@
#include <linux/mod_devicetable.h>
#endif

#include <pcmcia/bulkmem.h>
#include <pcmcia/cs_types.h>
#include <pcmcia/device_id.h>

@@ -51,6 +50,24 @@ typedef struct mtd_info_t {
u_int CardOffset;
} mtd_info_t;

typedef struct region_info_t {
u_int Attributes;
u_int CardOffset;
u_int RegionSize;
u_int AccessSpeed;
u_int BlockSize;
u_int PartMultiple;
u_char JedecMfr, JedecInfo;
memory_handle_t next;
} region_info_t;
#define REGION_TYPE 0x0001
#define REGION_TYPE_CM 0x0000
#define REGION_TYPE_AM 0x0001
#define REGION_PREFETCH 0x0008
#define REGION_CACHEABLE 0x0010
#define REGION_BAR_MASK 0xe000
#define REGION_BAR_SHIFT 13

typedef union ds_ioctl_arg_t {
adjust_t adjust;
config_info_t config;
1 change: 0 additions & 1 deletion include/pcmcia/ss.h
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@

#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
#include <pcmcia/bulkmem.h>
#ifdef CONFIG_CARDBUS
#include <linux/pci.h>
#endif

0 comments on commit ae49ec9

Please sign in to comment.