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

Commit 2cd1f0dd authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

isdn: replace ->proc_fops with ->proc_show 



And switch to proc_create_single_data.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent a2d03aac

drivers/isdn/capi/kcapi.c

+2 −1
Original line number Diff line number Diff line
@@ -534,7 +534,8 @@ int attach_capi_ctr(struct capi_ctr *ctr) 
	init_waitqueue_head(&ctr->state_wait_queue);



	sprintf(ctr->procfn, "capi/controllers/%d", ctr->cnr);

	ctr->procent = proc_create_data(ctr->procfn, 0, NULL, ctr->proc_fops, ctr);

	ctr->procent = proc_create_single_data(ctr->procfn, 0, NULL,

			ctr->proc_show, ctr);



	ncontrollers++;

drivers/isdn/gigaset/capi.c

+1 −15
Original line number Diff line number Diff line
@@ -2437,19 +2437,6 @@ static int gigaset_proc_show(struct seq_file *m, void *v) 
	return 0;

}



static int gigaset_proc_open(struct inode *inode, struct file *file)

{

	return single_open(file, gigaset_proc_show, PDE_DATA(inode));

}



static const struct file_operations gigaset_proc_fops = {

	.owner		= THIS_MODULE,

	.open		= gigaset_proc_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};



/**

 * gigaset_isdn_regdev() - register device to LL

 * @cs:		device descriptor structure.
@@ -2478,8 +2465,7 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid) 
	iif->ctr.register_appl = gigaset_register_appl;

	iif->ctr.release_appl  = gigaset_release_appl;

	iif->ctr.send_message  = gigaset_send_message;

	iif->ctr.procinfo      = gigaset_procinfo;

	iif->ctr.proc_fops = &gigaset_proc_fops;

	iif->ctr.proc_show     = gigaset_proc_show,

	INIT_LIST_HEAD(&iif->appls);

	skb_queue_head_init(&iif->sendqueue);

	atomic_set(&iif->sendqlen, 0);

drivers/isdn/hardware/avm/avmcard.h

+2 −2
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ u16 b1_send_message(struct capi_ctr *ctrl, struct sk_buff *skb); 
void b1_parse_version(avmctrl_info *card);

irqreturn_t b1_interrupt(int interrupt, void *devptr);



extern const struct file_operations b1ctl_proc_fops;

int b1_proc_show(struct seq_file *m, void *v);



avmcard_dmainfo *avmcard_dma_alloc(char *name, struct pci_dev *,

				   long rsize, long ssize);
@@ -576,6 +576,6 @@ void b1dma_register_appl(struct capi_ctr *ctrl, 
			 capi_register_params *rp);

void b1dma_release_appl(struct capi_ctr *ctrl, u16 appl);

u16  b1dma_send_message(struct capi_ctr *ctrl, struct sk_buff *skb);

extern const struct file_operations b1dmactl_proc_fops;

int b1dma_proc_show(struct seq_file *m, void *v);



#endif /* _AVMCARD_H_ */

drivers/isdn/hardware/avm/b1.c

+2 −15
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ irqreturn_t b1_interrupt(int interrupt, void *devptr) 
}



/* ------------------------------------------------------------- */

static int b1ctl_proc_show(struct seq_file *m, void *v)

int b1_proc_show(struct seq_file *m, void *v)

{

	struct capi_ctr *ctrl = m->private;

	avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
@@ -699,20 +699,7 @@ static int b1ctl_proc_show(struct seq_file *m, void *v) 


	return 0;

}



static int b1ctl_proc_open(struct inode *inode, struct file *file)

{

	return single_open(file, b1ctl_proc_show, PDE_DATA(inode));

}



const struct file_operations b1ctl_proc_fops = {

	.owner		= THIS_MODULE,

	.open		= b1ctl_proc_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};

EXPORT_SYMBOL(b1ctl_proc_fops);

EXPORT_SYMBOL(b1_proc_show);



/* ------------------------------------------------------------- */

drivers/isdn/hardware/avm/b1dma.c

+2 −15
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ u16 b1dma_send_message(struct capi_ctr *ctrl, struct sk_buff *skb) 


/* ------------------------------------------------------------- */



static int b1dmactl_proc_show(struct seq_file *m, void *v)

int b1dma_proc_show(struct seq_file *m, void *v)

{

	struct capi_ctr *ctrl = m->private;

	avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
@@ -941,20 +941,7 @@ static int b1dmactl_proc_show(struct seq_file *m, void *v) 


	return 0;

}



static int b1dmactl_proc_open(struct inode *inode, struct file *file)

{

	return single_open(file, b1dmactl_proc_show, PDE_DATA(inode));

}



const struct file_operations b1dmactl_proc_fops = {

	.owner		= THIS_MODULE,

	.open		= b1dmactl_proc_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};

EXPORT_SYMBOL(b1dmactl_proc_fops);

EXPORT_SYMBOL(b1dma_proc_show);



/* ------------------------------------------------------------- */