Skip to content

Commit

Permalink
Char: cyclades, remove some global vars
Browse files Browse the repository at this point in the history
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed May 8, 2007
1 parent f3851e7 commit 14a55a6
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions drivers/char/cyclades.c
Original file line number Diff line number Diff line change
Expand Up @@ -818,9 +818,6 @@ static int cy_chip_offset[] = { 0x0000,

/* PCI related definitions */

static unsigned short cy_pci_nboard;
static unsigned short cy_isa_nboard;
static unsigned short cy_nboard;
#ifdef CONFIG_PCI
static struct pci_device_id cy_pci_dev_id[] __devinitdata = {
{ PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Y_Lo) }, /* PCI < 1Mb */
Expand Down Expand Up @@ -5462,7 +5459,7 @@ static const struct tty_operations cy_ops = {

static int __init cy_init(void)
{
unsigned int i;
unsigned int i, nboards;

cy_serial_driver = alloc_tty_driver(NR_PORTS);
if (!cy_serial_driver)
Expand Down Expand Up @@ -5506,14 +5503,12 @@ static int __init cy_init(void)
the cy_next_channel. */

/* look for isa boards */
cy_isa_nboard = cy_detect_isa();
nboards = cy_detect_isa();

/* look for pci boards */
cy_pci_nboard = cy_detect_pci();

cy_nboard = cy_isa_nboard + cy_pci_nboard;
nboards += cy_detect_pci();

return 0;
return nboards ? 0 : -ENODEV;
} /* cy_init */

static void __exit cy_cleanup_module(void)
Expand Down

0 comments on commit 14a55a6

Please sign in to comment.