Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

And here's a patch (to be applied on top of the last) which prevents

Browse source 
this happening again by making use of 'const'.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Russell King 2009-01-02 13:44:27 +00:00 committed by Linus Torvalds
parent 9f2a036aaa
commit 975a1a7d88
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/serial/8250_pci.c
View file

@ -42,7 +42,8 @@ struct pci_serial_quirk {
u32 subvendor; u32 subvendor;
u32 subdevice; u32 subdevice;
int (*init)(struct pci_dev *dev); int (*init)(struct pci_dev *dev);
int (*setup)(struct serial_private *, struct pciserial_board *, int (*setup)(struct serial_private *,
const struct pciserial_board *,
struct uart_port *, int); struct uart_port *, int);
void (*exit)(struct pci_dev *dev); void (*exit)(struct pci_dev *dev);
}; };
@ -107,7 +108,7 @@ setup_port(struct serial_private *priv, struct uart_port *port,
* ADDI-DATA GmbH communication cards <info@addi-data.com> * ADDI-DATA GmbH communication cards <info@addi-data.com>
*/ */
static int addidata_apci7800_setup(struct serial_private *priv, static int addidata_apci7800_setup(struct serial_private *priv,
struct pciserial_board *board, const struct pciserial_board *board,
struct uart_port *port, int idx) struct uart_port *port, int idx)
{ {
unsigned int bar = 0, offset = board->first_offset; unsigned int bar = 0, offset = board->first_offset;
@ -134,7 +135,7 @@ static int addidata_apci7800_setup(struct serial_private *priv,
* Not that ugly ;) -- HW * Not that ugly ;) -- HW
*/ */
static int static int
afavlab_setup(struct serial_private *priv, struct pciserial_board *board, afavlab_setup(struct serial_private *priv, const struct pciserial_board *board,
struct uart_port *port, int idx) struct uart_port *port, int idx)
{ {
unsigned int bar, offset = board->first_offset; unsigned int bar, offset = board->first_offset;
@ -188,8 +189,9 @@ static int pci_hp_diva_init(struct pci_dev *dev)
* some serial ports are supposed to be hidden on certain models. * some serial ports are supposed to be hidden on certain models.
*/ */
static int static int
pci_hp_diva_setup(struct serial_private *priv, struct pciserial_board *board, pci_hp_diva_setup(struct serial_private *priv,
struct uart_port *port, int idx) const struct pciserial_board *board,
struct uart_port *port, int idx)
{ {
unsigned int offset = board->first_offset; unsigned int offset = board->first_offset;
unsigned int bar = FL_GET_BASE(board->flags); unsigned int bar = FL_GET_BASE(board->flags);
@ -306,7 +308,7 @@ static void __devexit pci_plx9050_exit(struct pci_dev *dev)
/* SBS Technologies Inc. PMC-OCTPRO and P-OCTAL cards */ /* SBS Technologies Inc. PMC-OCTPRO and P-OCTAL cards */
static int static int
sbs_setup(struct serial_private *priv, struct pciserial_board *board, sbs_setup(struct serial_private *priv, const struct pciserial_board *board,
struct uart_port *port, int idx) struct uart_port *port, int idx)
{ {
unsigned int bar, offset = board->first_offset; unsigned int bar, offset = board->first_offset;
@ -463,7 +465,7 @@ static int pci_siig_init(struct pci_dev *dev)
} }
static int pci_siig_setup(struct serial_private *priv, static int pci_siig_setup(struct serial_private *priv,
struct pciserial_board *board, const struct pciserial_board *board,
struct uart_port *port, int idx) struct uart_port *port, int idx)
{ {
unsigned int bar = FL_GET_BASE(board->flags) + idx, offset = 0; unsigned int bar = FL_GET_BASE(board->flags) + idx, offset = 0;
@ -534,7 +536,8 @@ static int pci_timedia_init(struct pci_dev *dev)
* Ugh, this is ugly as all hell --- TYT * Ugh, this is ugly as all hell --- TYT
*/ */
static int static int
pci_timedia_setup(struct serial_private *priv, struct pciserial_board *board, pci_timedia_setup(struct serial_private *priv,
const struct pciserial_board *board,
struct uart_port *port, int idx) struct uart_port *port, int idx)
{ {
unsigned int bar = 0, offset = board->first_offset; unsigned int bar = 0, offset = board->first_offset;
@ -568,7 +571,7 @@ pci_timedia_setup(struct serial_private *priv, struct pciserial_board *board,
*/ */
static int static int
titan_400l_800l_setup(struct serial_private *priv, titan_400l_800l_setup(struct serial_private *priv,
struct pciserial_board *board, const struct pciserial_board *board,
struct uart_port *port, int idx) struct uart_port *port, int idx)
{ {
unsigned int bar, offset = board->first_offset; unsigned int bar, offset = board->first_offset;
@ -770,7 +773,8 @@ static int pci_oxsemi_tornado_init(struct pci_dev *dev)
} }
static int static int
pci_default_setup(struct serial_private *priv, struct pciserial_board *board, pci_default_setup(struct serial_private *priv,
const struct pciserial_board *board,
struct uart_port *port, int idx) struct uart_port *port, int idx)
{ {
unsigned int bar, offset = board->first_offset, maxnr; unsigned int bar, offset = board->first_offset, maxnr;
@ -1099,7 +1103,7 @@ static struct pci_serial_quirk *find_quirk(struct pci_dev *dev)
} }
static inline int get_pci_irq(struct pci_dev *dev, static inline int get_pci_irq(struct pci_dev *dev,
struct pciserial_board *board) const struct pciserial_board *board)
{ {
if (board->flags & FL_NOIRQ) if (board->flags & FL_NOIRQ)
return 0; return 0;
@ -1894,8 +1898,8 @@ serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board)
} }
static inline int static inline int
serial_pci_matches(struct pciserial_board *board, serial_pci_matches(const struct pciserial_board *board,
struct pciserial_board *guessed) const struct pciserial_board *guessed)
{ {
return return
board->num_ports == guessed->num_ports && board->num_ports == guessed->num_ports &&
@ -1906,7 +1910,7 @@ serial_pci_matches(struct pciserial_board *board,
} }
struct serial_private * struct serial_private *
pciserial_init_ports(struct pci_dev *dev, struct pciserial_board *board) pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board)
{ {
struct uart_port serial_port; struct uart_port serial_port;
struct serial_private *priv; struct serial_private *priv;
@ -2039,7 +2043,8 @@ static int __devinit
pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent) pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
{ {
struct serial_private *priv; struct serial_private *priv;
struct pciserial_board *board, tmp; const struct pciserial_board *board;
struct pciserial_board tmp;
int rc; int rc;
if (ent->driver_data >= ARRAY_SIZE(pci_boards)) { if (ent->driver_data >= ARRAY_SIZE(pci_boards)) {
@ -2066,7 +2071,7 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
* We matched one of our class entries. Try to * We matched one of our class entries. Try to
* determine the parameters of this board. * determine the parameters of this board.
*/ */
rc = serial_pci_guess_board(dev, board); rc = serial_pci_guess_board(dev, &tmp);
if (rc) if (rc)
goto disable; goto disable;
} else { } else {

2
include/linux/8250_pci.h
View file

@ -31,7 +31,7 @@ struct pciserial_board {
struct serial_private; struct serial_private;
struct serial_private * struct serial_private *
pciserial_init_ports(struct pci_dev *dev, struct pciserial_board *board); pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board);
void pciserial_remove_ports(struct serial_private *priv); void pciserial_remove_ports(struct serial_private *priv);
void pciserial_suspend_ports(struct serial_private *priv); void pciserial_suspend_ports(struct serial_private *priv);
void pciserial_resume_ports(struct serial_private *priv); void pciserial_resume_ports(struct serial_private *priv);