Commit 83aa9aaa authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[PATCH] some parport_pc.c cleanups

The patch below makes the following changes to
drivers/parport/parport_pc.c :
- make some needlessly global functions static
- #if 0 two currently unused functions
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2986373c
...@@ -193,6 +193,7 @@ static int change_mode(struct parport *p, int m) ...@@ -193,6 +193,7 @@ static int change_mode(struct parport *p, int m)
#ifdef CONFIG_PARPORT_1284 #ifdef CONFIG_PARPORT_1284
/* Find FIFO lossage; FIFO is reset */ /* Find FIFO lossage; FIFO is reset */
#if 0
static int get_fifo_residue (struct parport *p) static int get_fifo_residue (struct parport *p)
{ {
int residue; int residue;
...@@ -233,6 +234,7 @@ static int get_fifo_residue (struct parport *p) ...@@ -233,6 +234,7 @@ static int get_fifo_residue (struct parport *p)
DPRINTK (KERN_DEBUG "*** get_fifo_residue: done residue collecting (ecr = 0x%2.2x)\n", inb (ECONTROL (p))); DPRINTK (KERN_DEBUG "*** get_fifo_residue: done residue collecting (ecr = 0x%2.2x)\n", inb (ECONTROL (p)));
return residue; return residue;
} }
#endif /* 0 */
#endif /* IEEE 1284 support */ #endif /* IEEE 1284 support */
#endif /* FIFO support */ #endif /* FIFO support */
...@@ -273,7 +275,7 @@ static irqreturn_t parport_pc_interrupt(int irq, void *dev_id, struct pt_regs *r ...@@ -273,7 +275,7 @@ static irqreturn_t parport_pc_interrupt(int irq, void *dev_id, struct pt_regs *r
return IRQ_HANDLED; return IRQ_HANDLED;
} }
void parport_pc_init_state(struct pardevice *dev, struct parport_state *s) static void parport_pc_init_state(struct pardevice *dev, struct parport_state *s)
{ {
s->u.pc.ctr = 0xc; s->u.pc.ctr = 0xc;
if (dev->irq_func && if (dev->irq_func &&
...@@ -285,7 +287,7 @@ void parport_pc_init_state(struct pardevice *dev, struct parport_state *s) ...@@ -285,7 +287,7 @@ void parport_pc_init_state(struct pardevice *dev, struct parport_state *s)
* D.Gruszka VScom */ * D.Gruszka VScom */
} }
void parport_pc_save_state(struct parport *p, struct parport_state *s) static void parport_pc_save_state(struct parport *p, struct parport_state *s)
{ {
const struct parport_pc_private *priv = p->physport->private_data; const struct parport_pc_private *priv = p->physport->private_data;
s->u.pc.ctr = priv->ctr; s->u.pc.ctr = priv->ctr;
...@@ -293,7 +295,7 @@ void parport_pc_save_state(struct parport *p, struct parport_state *s) ...@@ -293,7 +295,7 @@ void parport_pc_save_state(struct parport *p, struct parport_state *s)
s->u.pc.ecr = inb (ECONTROL (p)); s->u.pc.ecr = inb (ECONTROL (p));
} }
void parport_pc_restore_state(struct parport *p, struct parport_state *s) static void parport_pc_restore_state(struct parport *p, struct parport_state *s)
{ {
struct parport_pc_private *priv = p->physport->private_data; struct parport_pc_private *priv = p->physport->private_data;
register unsigned char c = s->u.pc.ctr & priv->ctr_writable; register unsigned char c = s->u.pc.ctr & priv->ctr_writable;
...@@ -732,9 +734,9 @@ dump_parport_state ("leave fifo_write_block_dma", port); ...@@ -732,9 +734,9 @@ dump_parport_state ("leave fifo_write_block_dma", port);
} }
/* Parallel Port FIFO mode (ECP chipsets) */ /* Parallel Port FIFO mode (ECP chipsets) */
size_t parport_pc_compat_write_block_pio (struct parport *port, static size_t parport_pc_compat_write_block_pio (struct parport *port,
const void *buf, size_t length, const void *buf, size_t length,
int flags) int flags)
{ {
size_t written; size_t written;
int r; int r;
...@@ -809,9 +811,9 @@ size_t parport_pc_compat_write_block_pio (struct parport *port, ...@@ -809,9 +811,9 @@ size_t parport_pc_compat_write_block_pio (struct parport *port,
/* ECP */ /* ECP */
#ifdef CONFIG_PARPORT_1284 #ifdef CONFIG_PARPORT_1284
size_t parport_pc_ecp_write_block_pio (struct parport *port, static size_t parport_pc_ecp_write_block_pio (struct parport *port,
const void *buf, size_t length, const void *buf, size_t length,
int flags) int flags)
{ {
size_t written; size_t written;
int r; int r;
...@@ -924,8 +926,10 @@ size_t parport_pc_ecp_write_block_pio (struct parport *port, ...@@ -924,8 +926,10 @@ size_t parport_pc_ecp_write_block_pio (struct parport *port,
return written; return written;
} }
size_t parport_pc_ecp_read_block_pio (struct parport *port, #if 0
void *buf, size_t length, int flags) static size_t parport_pc_ecp_read_block_pio (struct parport *port,
void *buf, size_t length,
int flags)
{ {
size_t left = length; size_t left = length;
size_t fifofull; size_t fifofull;
...@@ -1143,7 +1147,7 @@ dump_parport_state ("rev idle2", port); ...@@ -1143,7 +1147,7 @@ dump_parport_state ("rev idle2", port);
dump_parport_state ("fwd idle", port); dump_parport_state ("fwd idle", port);
return length - left; return length - left;
} }
#endif /* 0 */
#endif /* IEEE 1284 support */ #endif /* IEEE 1284 support */
#endif /* Allowed to use FIFO/DMA */ #endif /* Allowed to use FIFO/DMA */
...@@ -1156,7 +1160,7 @@ dump_parport_state ("fwd idle", port); ...@@ -1156,7 +1160,7 @@ dump_parport_state ("fwd idle", port);
/* GCC is not inlining extern inline function later overwriten to non-inline, /* GCC is not inlining extern inline function later overwriten to non-inline,
so we use outlined_ variants here. */ so we use outlined_ variants here. */
struct parport_operations parport_pc_ops = static struct parport_operations parport_pc_ops =
{ {
.write_data = parport_pc_write_data, .write_data = parport_pc_write_data,
.read_data = parport_pc_read_data, .read_data = parport_pc_read_data,
......
...@@ -228,12 +228,6 @@ extern void parport_pc_release_resources(struct parport *p); ...@@ -228,12 +228,6 @@ extern void parport_pc_release_resources(struct parport *p);
extern int parport_pc_claim_resources(struct parport *p); extern int parport_pc_claim_resources(struct parport *p);
extern void parport_pc_init_state(struct pardevice *, struct parport_state *s);
extern void parport_pc_save_state(struct parport *p, struct parport_state *s);
extern void parport_pc_restore_state(struct parport *p, struct parport_state *s);
/* PCMCIA code will want to get us to look at a port. Provide a mechanism. */ /* PCMCIA code will want to get us to look at a port. Provide a mechanism. */
extern struct parport *parport_pc_probe_port (unsigned long base, extern struct parport *parport_pc_probe_port (unsigned long base,
unsigned long base_hi, unsigned long base_hi,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment