projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ide: move ide_fixstring() documentation to ide-iops.c from ide.h
[cascardo/linux.git]
/
include
/
linux
/
parport_pc.h
diff --git
a/include/linux/parport_pc.h
b/include/linux/parport_pc.h
index
c6f7624
..
ea8c6d8
100644
(file)
--- a/
include/linux/parport_pc.h
+++ b/
include/linux/parport_pc.h
@@
-38,7
+38,6
@@
struct parport_pc_private {
/* buffer suitable for DMA, if DMA enabled */
char *dma_buf;
dma_addr_t dma_handle;
/* buffer suitable for DMA, if DMA enabled */
char *dma_buf;
dma_addr_t dma_handle;
- struct pci_dev *dev;
struct list_head list;
struct parport *port;
};
struct list_head list;
struct parport *port;
};
@@
-79,13
+78,13
@@
static __inline__ unsigned char parport_pc_read_data(struct parport *p)
}
#ifdef DEBUG_PARPORT
}
#ifdef DEBUG_PARPORT
-
extern __inline__
void dump_parport_state (char *str, struct parport *p)
+
static inline
void dump_parport_state (char *str, struct parport *p)
{
/* here's hoping that reading these ports won't side-effect anything underneath */
unsigned char ecr = inb (ECONTROL (p));
unsigned char dcr = inb (CONTROL (p));
unsigned char dsr = inb (STATUS (p));
{
/* here's hoping that reading these ports won't side-effect anything underneath */
unsigned char ecr = inb (ECONTROL (p));
unsigned char dcr = inb (CONTROL (p));
unsigned char dsr = inb (STATUS (p));
- static c
har *
ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"};
+ static c
onst char *const
ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"};
const struct parport_pc_private *priv = p->physport->private_data;
int i;
const struct parport_pc_private *priv = p->physport->private_data;
int i;
@@
-232,7
+231,7
@@
extern int parport_pc_claim_resources(struct parport *p);
extern struct parport *parport_pc_probe_port (unsigned long base,
unsigned long base_hi,
int irq, int dma,
extern struct parport *parport_pc_probe_port (unsigned long base,
unsigned long base_hi,
int irq, int dma,
- struct
pci_dev
*dev);
+ struct
device
*dev);
extern void parport_pc_unregister_port (struct parport *p);
#endif
extern void parport_pc_unregister_port (struct parport *p);
#endif