projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] zd1211rw: Add another ID for Linksys WUSBF54G
[powerpc.git]
/
drivers
/
parport
/
parport_pc.c
diff --git
a/drivers/parport/parport_pc.c
b/drivers/parport/parport_pc.c
index
5749500
..
3de2623
100644
(file)
--- a/
drivers/parport/parport_pc.c
+++ b/
drivers/parport/parport_pc.c
@@
-1546,7
+1546,7
@@
static void __devinit detect_and_report_smsc (void)
}
#endif /* CONFIG_PARPORT_PC_SUPERIO */
}
#endif /* CONFIG_PARPORT_PC_SUPERIO */
-static int
__devinit
get_superio_dma (struct parport *p)
+static int get_superio_dma (struct parport *p)
{
int i=0;
while( (superios[i].io != p->base) && (i<NR_SUPERIOS))
{
int i=0;
while( (superios[i].io != p->base) && (i<NR_SUPERIOS))
@@
-1975,7
+1975,7
@@
static int __devinit parport_ECPPS2_supported(struct parport *pb){return 0;}
/* --- IRQ detection -------------------------------------- */
/* Only if supports ECP mode */
/* --- IRQ detection -------------------------------------- */
/* Only if supports ECP mode */
-static int
__devinit
programmable_irq_support(struct parport *pb)
+static int programmable_irq_support(struct parport *pb)
{
int irq, intrLine;
unsigned char oecr = inb (ECONTROL (pb));
{
int irq, intrLine;
unsigned char oecr = inb (ECONTROL (pb));
@@
-1992,7
+1992,7
@@
static int __devinit programmable_irq_support(struct parport *pb)
return irq;
}
return irq;
}
-static int
__devinit
irq_probe_ECP(struct parport *pb)
+static int irq_probe_ECP(struct parport *pb)
{
int i;
unsigned long irqs;
{
int i;
unsigned long irqs;
@@
-2020,7
+2020,7
@@
static int __devinit irq_probe_ECP(struct parport *pb)
* This detection seems that only works in National Semiconductors
* This doesn't work in SMC, LGS, and Winbond
*/
* This detection seems that only works in National Semiconductors
* This doesn't work in SMC, LGS, and Winbond
*/
-static int
__devinit
irq_probe_EPP(struct parport *pb)
+static int irq_probe_EPP(struct parport *pb)
{
#ifndef ADVANCED_DETECT
return PARPORT_IRQ_NONE;
{
#ifndef ADVANCED_DETECT
return PARPORT_IRQ_NONE;
@@
-2059,7
+2059,7
@@
static int __devinit irq_probe_EPP(struct parport *pb)
#endif /* Advanced detection */
}
#endif /* Advanced detection */
}
-static int
__devinit
irq_probe_SPP(struct parport *pb)
+static int irq_probe_SPP(struct parport *pb)
{
/* Don't even try to do this. */
return PARPORT_IRQ_NONE;
{
/* Don't even try to do this. */
return PARPORT_IRQ_NONE;
@@
-2106,7
+2106,7
@@
static int parport_irq_probe(struct parport *pb)
/* --- DMA detection -------------------------------------- */
/* Only if chipset conforms to ECP ISA Interface Standard */
/* --- DMA detection -------------------------------------- */
/* Only if chipset conforms to ECP ISA Interface Standard */
-static int
__devinit
programmable_dma_support (struct parport *p)
+static int programmable_dma_support (struct parport *p)
{
unsigned char oecr = inb (ECONTROL (p));
int dma;
{
unsigned char oecr = inb (ECONTROL (p));
int dma;
@@
-2123,7
+2123,7
@@
static int __devinit programmable_dma_support (struct parport *p)
return dma;
}
return dma;
}
-static int
__devinit
parport_dma_probe (struct parport *p)
+static int parport_dma_probe (struct parport *p)
{
const struct parport_pc_private *priv = p->private_data;
if (priv->ecr)
{
const struct parport_pc_private *priv = p->private_data;
if (priv->ecr)