Skip to content

L
linux
Commit 241ce641 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds
Browse files
Options

[PATCH] GCC 3.4 fixes for PA-RISC parport support 

 - Move include/asm/parport_gsc.h to drivers/parport/
 - Fix gcc 3.4 compilation (redefined extern inline functions are not
   considered for inlining)

From: Joel Soete <joel.soete@tiscali.be>
Signed-off-by: default avatarGrant Grundler <grundler@parisc-linux.org>
Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 13d38e96
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 113 deletions
drivers/parport/parport_gsc.c
View file @ 241ce641
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include <asm/pdc.h> #include <asm/pdc.h>
#include <asm/parisc-device.h> #include <asm/parisc-device.h>
#include <asm/hardware.h> #include <asm/hardware.h>
#include <asm/parport_gsc.h> #include "parport_gsc.h"
MODULE_AUTHOR("Helge Deller <deller@gmx.de>"); MODULE_AUTHOR("Helge Deller <deller@gmx.de>");
...@@ -87,95 +87,6 @@ static irqreturn_t parport_gsc_interrupt(int irq, void *dev_id, struct pt_regs * ...@@ -87,95 +87,6 @@ static irqreturn_t parport_gsc_interrupt(int irq, void *dev_id, struct pt_regs *
return IRQ_HANDLED; return IRQ_HANDLED;
} }
void parport_gsc_write_data(struct parport *p, unsigned char d)
{
parport_writeb (d, DATA (p));
}
unsigned char parport_gsc_read_data(struct parport *p)
{
unsigned char c = parport_readb (DATA (p));
return c;
}
void parport_gsc_write_control(struct parport *p, unsigned char d)
{
const unsigned char wm = (PARPORT_CONTROL_STROBE |
PARPORT_CONTROL_AUTOFD |
PARPORT_CONTROL_INIT |
PARPORT_CONTROL_SELECT);
/* Take this out when drivers have adapted to the newer interface. */
if (d & 0x20) {
pr_debug("%s (%s): use data_reverse for this!\n",
p->name, p->cad->name);
parport_gsc_data_reverse (p);
}
__parport_gsc_frob_control (p, wm, d & wm);
}
unsigned char parport_gsc_read_control(struct parport *p)
{
const unsigned char wm = (PARPORT_CONTROL_STROBE |
PARPORT_CONTROL_AUTOFD |
PARPORT_CONTROL_INIT |
PARPORT_CONTROL_SELECT);
const struct parport_gsc_private *priv = p->physport->private_data;
return priv->ctr & wm; /* Use soft copy */
}
unsigned char parport_gsc_frob_control (struct parport *p, unsigned char mask,
unsigned char val)
{
const unsigned char wm = (PARPORT_CONTROL_STROBE |
PARPORT_CONTROL_AUTOFD |
PARPORT_CONTROL_INIT |
PARPORT_CONTROL_SELECT);
/* Take this out when drivers have adapted to the newer interface. */
if (mask & 0x20) {
pr_debug("%s (%s): use data_%s for this!\n",
p->name, p->cad->name,
(val & 0x20) ? "reverse" : "forward");
if (val & 0x20)
parport_gsc_data_reverse (p);
else
parport_gsc_data_forward (p);
}
/* Restrict mask and val to control lines. */
mask &= wm;
val &= wm;
return __parport_gsc_frob_control (p, mask, val);
}
unsigned char parport_gsc_read_status(struct parport *p)
{
return parport_readb (STATUS (p));
}
void parport_gsc_disable_irq(struct parport *p)
{
__parport_gsc_frob_control (p, 0x10, 0);
}
void parport_gsc_enable_irq(struct parport *p)
{
__parport_gsc_frob_control (p, 0x10, 0x10);
}
void parport_gsc_data_forward (struct parport *p)
{
__parport_gsc_frob_control (p, 0x20, 0);
}
void parport_gsc_data_reverse (struct parport *p)
{
__parport_gsc_frob_control (p, 0x20, 0x20);
}
void parport_gsc_init_state(struct pardevice *dev, struct parport_state *s) void parport_gsc_init_state(struct pardevice *dev, struct parport_state *s)
{ {
s->u.pc.ctr = 0xc | (dev->irq_func ? 0x10 : 0x0); s->u.pc.ctr = 0xc | (dev->irq_func ? 0x10 : 0x0);
......
include/asm-parisc/parport_gsc.h → drivers/parport/parport_gsc.h
View file @ 241ce641
#ifndef __LINUX_PARPORT_GSC_H /*
#define __LINUX_PARPORT_GSC_H * Low-level parallel-support for PC-style hardware integrated in the
* LASI-Controller (on GSC-Bus) for HP-PARISC Workstations
*
* (C) 1999-2001 by Helge Deller <deller@gmx.de>
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* based on parport_pc.c by
* Grant Guenther <grant@torque.net>
* Phil Blundell <Philip.Blundell@pobox.com>
* Tim Waugh <tim@cyberelk.demon.co.uk>
* Jose Renau <renau@acm.org>
* David Campbell <campbell@torque.net>
* Andrea Arcangeli
*/
#ifndef __DRIVERS_PARPORT_PARPORT_GSC_H
#define __DRIVERS_PARPORT_PARPORT_GSC_H
#include <asm/io.h> #include <asm/io.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -52,7 +82,7 @@ struct parport_gsc_private { ...@@ -52,7 +82,7 @@ struct parport_gsc_private {
struct pci_dev *dev; struct pci_dev *dev;
}; };
extern __inline__ void parport_gsc_write_data(struct parport *p, unsigned char d) static inline void parport_gsc_write_data(struct parport *p, unsigned char d)
{ {
#ifdef DEBUG_PARPORT #ifdef DEBUG_PARPORT
printk (KERN_DEBUG "parport_gsc_write_data(%p,0x%02x)\n", p, d); printk (KERN_DEBUG "parport_gsc_write_data(%p,0x%02x)\n", p, d);
...@@ -60,7 +90,7 @@ extern __inline__ void parport_gsc_write_data(struct parport *p, unsigned char d ...@@ -60,7 +90,7 @@ extern __inline__ void parport_gsc_write_data(struct parport *p, unsigned char d
parport_writeb(d, DATA(p)); parport_writeb(d, DATA(p));
} }
extern __inline__ unsigned char parport_gsc_read_data(struct parport *p) static inline unsigned char parport_gsc_read_data(struct parport *p)
{ {
unsigned char val = parport_readb (DATA (p)); unsigned char val = parport_readb (DATA (p));
#ifdef DEBUG_PARPORT #ifdef DEBUG_PARPORT
...@@ -72,9 +102,9 @@ extern __inline__ unsigned char parport_gsc_read_data(struct parport *p) ...@@ -72,9 +102,9 @@ extern __inline__ unsigned char parport_gsc_read_data(struct parport *p)
/* __parport_gsc_frob_control differs from parport_gsc_frob_control in that /* __parport_gsc_frob_control differs from parport_gsc_frob_control in that
* it doesn't do any extra masking. */ * it doesn't do any extra masking. */
static __inline__ unsigned char __parport_gsc_frob_control (struct parport *p, static inline unsigned char __parport_gsc_frob_control(struct parport *p,
unsigned char mask, unsigned char mask,
unsigned char val) unsigned char val)
{ {
struct parport_gsc_private *priv = p->physport->private_data; struct parport_gsc_private *priv = p->physport->private_data;
unsigned char ctr = priv->ctr; unsigned char ctr = priv->ctr;
...@@ -90,17 +120,17 @@ static __inline__ unsigned char __parport_gsc_frob_control (struct parport *p, ...@@ -90,17 +120,17 @@ static __inline__ unsigned char __parport_gsc_frob_control (struct parport *p,
return ctr; return ctr;
} }
extern __inline__ void parport_gsc_data_reverse (struct parport *p) static inline void parport_gsc_data_reverse(struct parport *p)
{ {
__parport_gsc_frob_control (p, 0x20, 0x20); __parport_gsc_frob_control (p, 0x20, 0x20);
} }
extern __inline__ void parport_gsc_data_forward (struct parport *p) static inline void parport_gsc_data_forward(struct parport *p)
{ {
__parport_gsc_frob_control (p, 0x20, 0x00); __parport_gsc_frob_control (p, 0x20, 0x00);
} }
extern __inline__ void parport_gsc_write_control (struct parport *p, static inline void parport_gsc_write_control(struct parport *p,
unsigned char d) unsigned char d)
{ {
const unsigned char wm = (PARPORT_CONTROL_STROBE | const unsigned char wm = (PARPORT_CONTROL_STROBE |
...@@ -118,7 +148,7 @@ extern __inline__ void parport_gsc_write_control (struct parport *p, ...@@ -118,7 +148,7 @@ extern __inline__ void parport_gsc_write_control (struct parport *p,
__parport_gsc_frob_control (p, wm, d & wm); __parport_gsc_frob_control (p, wm, d & wm);
} }
extern __inline__ unsigned char parport_gsc_read_control(struct parport *p) static inline unsigned char parport_gsc_read_control(struct parport *p)
{ {
const unsigned char rm = (PARPORT_CONTROL_STROBE | const unsigned char rm = (PARPORT_CONTROL_STROBE |
PARPORT_CONTROL_AUTOFD | PARPORT_CONTROL_AUTOFD |
...@@ -128,9 +158,9 @@ extern __inline__ unsigned char parport_gsc_read_control(struct parport *p) ...@@ -128,9 +158,9 @@ extern __inline__ unsigned char parport_gsc_read_control(struct parport *p)
return priv->ctr & rm; /* Use soft copy */ return priv->ctr & rm; /* Use soft copy */
} }
extern __inline__ unsigned char parport_gsc_frob_control (struct parport *p, static inline unsigned char parport_gsc_frob_control(struct parport *p,
unsigned char mask, unsigned char mask,
unsigned char val) unsigned char val)
{ {
const unsigned char wm = (PARPORT_CONTROL_STROBE | const unsigned char wm = (PARPORT_CONTROL_STROBE |
PARPORT_CONTROL_AUTOFD | PARPORT_CONTROL_AUTOFD |
...@@ -155,18 +185,17 @@ extern __inline__ unsigned char parport_gsc_frob_control (struct parport *p, ...@@ -155,18 +185,17 @@ extern __inline__ unsigned char parport_gsc_frob_control (struct parport *p,
return __parport_gsc_frob_control (p, mask, val); return __parport_gsc_frob_control (p, mask, val);
} }
extern __inline__ unsigned char parport_gsc_read_status(struct parport *p) static inline unsigned char parport_gsc_read_status(struct parport *p)
{ {
return parport_readb (STATUS(p)); return parport_readb (STATUS(p));
} }
static inline void parport_gsc_disable_irq(struct parport *p)
extern __inline__ void parport_gsc_disable_irq(struct parport *p)
{ {
__parport_gsc_frob_control (p, 0x10, 0x00); __parport_gsc_frob_control (p, 0x10, 0x00);
} }
extern __inline__ void parport_gsc_enable_irq(struct parport *p) static inline void parport_gsc_enable_irq(struct parport *p)
{ {
__parport_gsc_frob_control (p, 0x10, 0x10); __parport_gsc_frob_control (p, 0x10, 0x10);
} }
...@@ -185,9 +214,9 @@ extern void parport_gsc_inc_use_count(void); ...@@ -185,9 +214,9 @@ extern void parport_gsc_inc_use_count(void);
extern void parport_gsc_dec_use_count(void); extern void parport_gsc_dec_use_count(void);
extern struct parport *parport_gsc_probe_port (unsigned long base, extern struct parport *parport_gsc_probe_port(unsigned long base,
unsigned long base_hi, unsigned long base_hi,
int irq, int dma, int irq, int dma,
struct pci_dev *dev); struct pci_dev *dev);
#endif #endif /* __DRIVERS_PARPORT_PARPORT_GSC_H */
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7