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

Commit f95d45d1 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: pcm_common: remove module 



This module is built whenever CONFIG_COMEDI is enabled but it is
only used by the pcmmio and pcmuio drivers. The pcm_common module
consists of one exported function. Put a local copy of the function
in the pcmmio and pcmuio drivers.

This removes the need for the pcm_common module and the now unused
pcm_common.[ch] files can be deleted and removed from the Makefile.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 215caceb

drivers/staging/comedi/drivers/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#



# Comedi "helper" modules

obj-$(CONFIG_COMEDI)			+= pcm_common.o



# Comedi misc drivers

obj-$(CONFIG_COMEDI_BOND)		+= comedi_bond.o

drivers/staging/comedi/drivers/pcm_common.c

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
#include "../comedidev.h"



#include "comedi_fc.h"

#include "pcm_common.h"



int comedi_pcm_cmdtest(struct comedi_device *dev,

		       struct comedi_subdevice *s, struct comedi_cmd *cmd)

{

	int err = 0;



	/* Step 1 : check if triggers are trivially valid */



	err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT);

	err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_EXT);

	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_NOW);

	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);



	if (err)

		return 1;



	/* Step 2a : make sure trigger sources are unique */



	err |= cfc_check_trigger_is_unique(cmd->start_src);

	err |= cfc_check_trigger_is_unique(cmd->stop_src);



	/* Step 2b : and mutually compatible */



	if (err)

		return 2;



	/* Step 3: check if arguments are trivially valid */



	err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);

	err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);

	err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);

	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);



	switch (cmd->stop_src) {

	case TRIG_COUNT:

		/* any count allowed */

		break;

	case TRIG_NONE:

		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);

		break;

	default:

		break;

	}



	if (err)

		return 3;



	/* step 4: fix up any arguments */



	/* if (err) return 4; */



	return 0;

}

EXPORT_SYMBOL(comedi_pcm_cmdtest);



MODULE_AUTHOR("Comedi http://www.comedi.org");

MODULE_DESCRIPTION("Comedi low-level driver");

MODULE_LICENSE("GPL");

drivers/staging/comedi/drivers/pcm_common.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#ifndef _comedi_common_H

#define _comedi_common_H



extern int comedi_pcm_cmdtest(struct comedi_device *dev,

			      struct comedi_subdevice *s,

			      struct comedi_cmd *cmd);



#endif

drivers/staging/comedi/drivers/pcmmio.c

+55 −6
Original line number Diff line number Diff line
@@ -78,9 +78,10 @@ Configuration Options: 


#include <linux/interrupt.h>

#include <linux/slab.h>

#include <linux/pci.h>



#include "../comedidev.h"

#include "pcm_common.h"

#include <linux/pci.h>		/* for PCI devices */

#include "comedi_fc.h"



/* This stuff is all from pcmuio.c -- it refers to the DIO subdevices only */

#define CHANS_PER_PORT   8
@@ -802,11 +803,59 @@ static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	return 0;

}



static int

pcmmio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,

static int pcmmio_cmdtest(struct comedi_device *dev,

			  struct comedi_subdevice *s,

			  struct comedi_cmd *cmd)

{

	return comedi_pcm_cmdtest(dev, s, cmd);

	int err = 0;



	/* Step 1 : check if triggers are trivially valid */



	err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT);

	err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_EXT);

	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_NOW);

	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);



	if (err)

		return 1;



	/* Step 2a : make sure trigger sources are unique */



	err |= cfc_check_trigger_is_unique(cmd->start_src);

	err |= cfc_check_trigger_is_unique(cmd->stop_src);



	/* Step 2b : and mutually compatible */



	if (err)

		return 2;



	/* Step 3: check if arguments are trivially valid */



	err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);

	err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);

	err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);

	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);



	switch (cmd->stop_src) {

	case TRIG_COUNT:

		/* any count allowed */

		break;

	case TRIG_NONE:

		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);

		break;

	default:

		break;

	}



	if (err)

		return 3;



	/* step 4: fix up any arguments */



	/* if (err) return 4; */



	return 0;

}



static int adc_wait_ready(unsigned long iobase)

drivers/staging/comedi/drivers/pcmuio.c

+55 −7
Original line number Diff line number Diff line
@@ -77,10 +77,10 @@ Configuration Options: 


#include <linux/interrupt.h>

#include <linux/slab.h>

#include "../comedidev.h"

#include "pcm_common.h"

#include <linux/pci.h>



#include <linux/pci.h>		/* for PCI devices */

#include "../comedidev.h"

#include "comedi_fc.h"



#define CHANS_PER_PORT   8

#define PORTS_PER_ASIC   6
@@ -740,11 +740,59 @@ static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	return 0;

}



static int

pcmuio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,

static int pcmuio_cmdtest(struct comedi_device *dev,

			  struct comedi_subdevice *s,

			  struct comedi_cmd *cmd)

{

	return comedi_pcm_cmdtest(dev, s, cmd);

	int err = 0;



	/* Step 1 : check if triggers are trivially valid */



	err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW | TRIG_INT);

	err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_EXT);

	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_NOW);

	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);



	if (err)

		return 1;



	/* Step 2a : make sure trigger sources are unique */



	err |= cfc_check_trigger_is_unique(cmd->start_src);

	err |= cfc_check_trigger_is_unique(cmd->stop_src);



	/* Step 2b : and mutually compatible */



	if (err)

		return 2;



	/* Step 3: check if arguments are trivially valid */



	err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);

	err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);

	err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);

	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);



	switch (cmd->stop_src) {

	case TRIG_COUNT:

		/* any count allowed */

		break;

	case TRIG_NONE:

		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);

		break;

	default:

		break;

	}



	if (err)

		return 3;



	/* step 4: fix up any arguments */



	/* if (err) return 4; */



	return 0;

}



static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)