Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b81cc310 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

Char: cyclades, unexport struct cyclades_card 



Do not export internal card data to userspace. cytune doesn't use this
anyway.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cff9494f

drivers/char/cyclades.c

+0 −8
Original line number Diff line number Diff line
@@ -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;

include/linux/cyclades.h

+2 −13
Original line number Diff line number Diff line
@@ -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
@@ -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;
@@ -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) *