Skip to content

Commit

Permalink
Char: cyclades, unexport struct cyclades_card
Browse files Browse the repository at this point in the history
Do not export internal card data to userspace. cytune doesn't use this
anyway.

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 cff9494 commit b81cc31
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 21 deletions.
8 changes: 0 additions & 8 deletions drivers/char/cyclades.c
Original file line number Diff line number Diff line change
Expand Up @@ -4049,14 +4049,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
case CYGETRTSDTR_INV:
ret_val = info->rtsdtr_inv;
break;
case CYGETCARDINFO:
if (copy_to_user(argp, &cy_card[info->card],
sizeof(struct cyclades_card))) {
ret_val = -EFAULT;
break;
}
ret_val = 0;
break;
case CYGETCD1400VER:
ret_val = info->chip_rev;
break;
Expand Down
15 changes: 2 additions & 13 deletions include/linux/cyclades.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ struct cyclades_idle_stats {
#define CYZSETPOLLCYCLE 0x43590e
#define CYZGETPOLLCYCLE 0x43590f
#define CYGETCD1400VER 0x435910
#define CYGETCARDINFO 0x435911
#define CYSETWAIT 0x435912
#define CYGETWAIT 0x435913

Expand Down Expand Up @@ -506,8 +505,9 @@ struct ZFW_CTRL {
/****************** ****************** *******************/
#endif

#ifdef __KERNEL__

/* Per card data structure */
struct resource;
struct cyclades_card {
unsigned long base_phys;
unsigned long ctl_phys;
Expand All @@ -520,20 +520,9 @@ struct cyclades_card {
int bus_index; /* address shift - 0 for ISA, 1 for PCI */
int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */
struct pci_dev *pdev;
#ifdef __KERNEL__
spinlock_t card_lock;
#else
unsigned long filler;
#endif
};

struct cyclades_chip {
int filler;
};


#ifdef __KERNEL__

/***************************************
* Memory access functions/macros *
* (required to support Alpha systems) *
Expand Down

0 comments on commit b81cc31

Please sign in to comment.