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

Commit 6576c289 authored by Jan Kiszka's avatar Jan Kiszka Committed by David S. Miller
Browse files

CAPI: Drop obsolete nccip from capiminor struct 



The nccip in capiminor used to serve as an indicator that the NCCI was
close. But we don't need this, we issue a hangup on capincci_free_minor.
So drop this legacy.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@web.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30bced91

drivers/isdn/capi/capi.c

+1 −43
Original line number Original line Diff line number Diff line
@@ -85,7 +85,6 @@ struct datahandle_queue { 
struct capiminor {

struct capiminor {

	struct kref kref;

	struct kref kref;





	struct capincci  *nccip;

	unsigned int      minor;

	unsigned int      minor;

	struct dentry *capifs_dentry;

	struct dentry *capifs_dentry;
@@ -328,10 +327,6 @@ static void capincci_alloc_minor(struct capidev *cdev, struct capincci *np) 




	mp = np->minorp = capiminor_alloc(&cdev->ap, np->ncci);

	mp = np->minorp = capiminor_alloc(&cdev->ap, np->ncci);

	if (mp) {

	if (mp) {

		mp->nccip = np;

#ifdef _DEBUG_REFCOUNT

		printk(KERN_DEBUG "set mp->nccip\n");

#endif

		device = MKDEV(capinc_tty_driver->major, mp->minor);

		device = MKDEV(capinc_tty_driver->major, mp->minor);

		mp->capifs_dentry = capifs_new_ncci(mp->minor, device);

		mp->capifs_dentry = capifs_new_ncci(mp->minor, device);

	}

	}
@@ -347,10 +342,6 @@ static void capincci_free_minor(struct capincci *np) 




		tty = tty_port_tty_get(&mp->port);

		tty = tty_port_tty_get(&mp->port);

		if (tty) {

		if (tty) {

			mp->nccip = NULL;

#ifdef _DEBUG_REFCOUNT

			printk(KERN_DEBUG "reset mp->nccip\n");

#endif

			tty_vhangup(tty);

			tty_vhangup(tty);

			tty_kref_put(tty);

			tty_kref_put(tty);

		}

		}
@@ -1105,13 +1096,6 @@ static int capinc_tty_write(struct tty_struct * tty, 
	printk(KERN_DEBUG "capinc_tty_write(count=%d)\n", count);

	printk(KERN_DEBUG "capinc_tty_write(count=%d)\n", count);

#endif

#endif





	if (!mp->nccip) {

#ifdef _DEBUG_TTYFUNCS

		printk(KERN_DEBUG "capinc_tty_write: mp or mp->ncci NULL\n");

#endif

		return 0;

	}



	spin_lock_irqsave(&workaround_lock, flags);

	spin_lock_irqsave(&workaround_lock, flags);

	skb = mp->ttyskb;

	skb = mp->ttyskb;

	if (skb) {

	if (skb) {
@@ -1149,13 +1133,6 @@ static int capinc_tty_put_char(struct tty_struct *tty, unsigned char ch) 
	printk(KERN_DEBUG "capinc_put_char(%u)\n", ch);

	printk(KERN_DEBUG "capinc_put_char(%u)\n", ch);

#endif

#endif





	if (!mp->nccip) {

#ifdef _DEBUG_TTYFUNCS

		printk(KERN_DEBUG "capinc_tty_put_char: mp or mp->ncci NULL\n");

#endif

		return 0;

	}



	spin_lock_irqsave(&workaround_lock, flags);

	spin_lock_irqsave(&workaround_lock, flags);

	skb = mp->ttyskb;

	skb = mp->ttyskb;

	if (skb) {

	if (skb) {
@@ -1192,13 +1169,6 @@ static void capinc_tty_flush_chars(struct tty_struct *tty) 
	printk(KERN_DEBUG "capinc_tty_flush_chars\n");

	printk(KERN_DEBUG "capinc_tty_flush_chars\n");

#endif

#endif





	if (!mp->nccip) {

#ifdef _DEBUG_TTYFUNCS

		printk(KERN_DEBUG "capinc_tty_flush_chars: mp or mp->ncci NULL\n");

#endif

		return;

	}



	spin_lock_irqsave(&workaround_lock, flags);

	spin_lock_irqsave(&workaround_lock, flags);

	skb = mp->ttyskb;

	skb = mp->ttyskb;

	if (skb) {

	if (skb) {
@@ -1216,12 +1186,6 @@ static int capinc_tty_write_room(struct tty_struct *tty) 
	struct capiminor *mp = tty->driver_data;

	struct capiminor *mp = tty->driver_data;

	int room;

	int room;





	if (!mp->nccip) {

#ifdef _DEBUG_TTYFUNCS

		printk(KERN_DEBUG "capinc_tty_write_room: mp or mp->ncci NULL\n");

#endif

		return 0;

	}

	room = CAPINC_MAX_SENDQUEUE-skb_queue_len(&mp->outqueue);

	room = CAPINC_MAX_SENDQUEUE-skb_queue_len(&mp->outqueue);

	room *= CAPI_MAX_BLKSIZE;

	room *= CAPI_MAX_BLKSIZE;

#ifdef _DEBUG_TTYFUNCS

#ifdef _DEBUG_TTYFUNCS
@@ -1234,12 +1198,6 @@ static int capinc_tty_chars_in_buffer(struct tty_struct *tty) 
{

{

	struct capiminor *mp = tty->driver_data;

	struct capiminor *mp = tty->driver_data;





	if (!mp->nccip) {

#ifdef _DEBUG_TTYFUNCS

		printk(KERN_DEBUG "capinc_tty_chars_in_buffer: mp or mp->ncci NULL\n");

#endif

		return 0;

	}

#ifdef _DEBUG_TTYFUNCS

#ifdef _DEBUG_TTYFUNCS

	printk(KERN_DEBUG "capinc_tty_chars_in_buffer = %d nack=%d sq=%d rq=%d\n",

	printk(KERN_DEBUG "capinc_tty_chars_in_buffer = %d nack=%d sq=%d rq=%d\n",

			mp->outbytes, mp->nack,

			mp->outbytes, mp->nack,