Skip to content

Commit

Permalink
staging: comedi: drivers: remove remaining devpriv macros
Browse files Browse the repository at this point in the history 
The remaining comedi drivers that still have a devpriv macro
are all pretty straight forward for removing the devpriv
macro.

This macro relies on a local variable having a specific name.
Remove its use by replacing it with a local variable where
used.

The inline function alloc_private(), used to kzalloc the
dev->private memory, returns non-zero if there is an error.
Fix all the alloc_private() calls accordingly and remove any
kernel messages or obvious comments that still exist in the
drivers. Leave a comment in the skel driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 22, 2012
1 parent 0e05c55 commit 9a1a6cf
Show file tree
Hide file tree
Showing 60 changed files with 597 additions and 272 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/8255_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ static int pci_8255_attach_pci(struct comedi_device *dev,
dev->board_name = board->name;

ret = alloc_private(dev, sizeof(*devpriv));
if (ret < 0)
if (ret)
return ret;
devpriv = dev->private;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adl_pci6208.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static int pci6208_attach_pci(struct comedi_device *dev,
dev->board_name = boardinfo->name;

ret = alloc_private(dev, sizeof(*devpriv));
if (ret < 0)
if (ret)
return ret;
devpriv = dev->private;

Expand Down
6 changes: 2 additions & 4 deletions drivers/staging/comedi/drivers/adl_pci9118.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1924,10 +1924,8 @@ static int pci9118_attach(struct comedi_device *dev,
master = 1;

ret = alloc_private(dev, sizeof(*devpriv));
if (ret < 0) {
printk(" - Allocation failed!\n");
return -ENOMEM;
}
if (ret)
return ret;
devpriv = dev->private;

pcidev = pci9118_find_pci(dev, it);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adv_pci1710.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,7 @@ static int pci1710_attach_pci(struct comedi_device *dev,
dev->board_name = this_board->name;

ret = alloc_private(dev, sizeof(*devpriv));
if (ret < 0)
if (ret)
return ret;
devpriv = dev->private;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adv_pci1723.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ static int pci1723_attach_pci(struct comedi_device *dev,
dev->board_name = dev->driver->driver_name;

ret = alloc_private(dev, sizeof(*devpriv));
if (ret < 0)
if (ret)
return ret;
devpriv = dev->private;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/adv_pci_dio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ static int pci_dio_attach_pci(struct comedi_device *dev,
dev->board_name = this_board->name;

ret = alloc_private(dev, sizeof(*devpriv));
if (ret < 0)
if (ret)
return ret;
devpriv = dev->private;

Expand Down
18 changes: 10 additions & 8 deletions drivers/staging/comedi/drivers/amplc_dio200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1334,15 +1334,15 @@ static int dio200_pci_common_attach(struct comedi_device *dev,
static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
const struct dio200_board *thisboard = comedi_board(dev);
struct dio200_private *devpriv;
int ret;

dev_info(dev->class_dev, DIO200_DRIVER_NAME ": attach\n");

ret = alloc_private(dev, sizeof(struct dio200_private));
if (ret < 0) {
dev_err(dev->class_dev, "error! out of memory!\n");
ret = alloc_private(dev, sizeof(*devpriv));
if (ret)
return ret;
}
devpriv = dev->private;

/* Process options and reserve resources according to bus type. */
if (is_isa_board(thisboard)) {
Expand Down Expand Up @@ -1377,18 +1377,20 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int __devinit dio200_attach_pci(struct comedi_device *dev,
struct pci_dev *pci_dev)
{
struct dio200_private *devpriv;
int ret;

if (!DO_PCI)
return -EINVAL;

dev_info(dev->class_dev, DIO200_DRIVER_NAME ": attach pci %s\n",
pci_name(pci_dev));
ret = alloc_private(dev, sizeof(struct dio200_private));
if (ret < 0) {
dev_err(dev->class_dev, "error! out of memory!\n");

ret = alloc_private(dev, sizeof(*devpriv));
if (ret)
return ret;
}
devpriv = dev->private;

dev->board_ptr = dio200_find_pci_board(pci_dev);
if (dev->board_ptr == NULL) {
dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
Expand Down
20 changes: 12 additions & 8 deletions drivers/staging/comedi/drivers/amplc_pc236.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,14 +505,16 @@ static int pc236_pci_common_attach(struct comedi_device *dev,
static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
const struct pc236_board *thisboard = comedi_board(dev);
struct pc236_private *devpriv;
int ret;

dev_info(dev->class_dev, PC236_DRIVER_NAME ": attach\n");
ret = alloc_private(dev, sizeof(struct pc236_private));
if (ret < 0) {
dev_err(dev->class_dev, "error! out of memory!\n");

ret = alloc_private(dev, sizeof(*devpriv));
if (ret)
return ret;
}
devpriv = dev->private;

/* Process options according to bus type. */
if (is_isa_board(thisboard)) {
unsigned long iobase = it->options[0];
Expand Down Expand Up @@ -543,18 +545,20 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int __devinit pc236_attach_pci(struct comedi_device *dev,
struct pci_dev *pci_dev)
{
struct pc236_private *devpriv;
int ret;

if (!DO_PCI)
return -EINVAL;

dev_info(dev->class_dev, PC236_DRIVER_NAME ": attach pci %s\n",
pci_name(pci_dev));
ret = alloc_private(dev, sizeof(struct pc236_private));
if (ret < 0) {
dev_err(dev->class_dev, "error! out of memory!\n");

ret = alloc_private(dev, sizeof(*devpriv));
if (ret)
return ret;
}
devpriv = dev->private;

dev->board_ptr = pc236_find_pci_board(pci_dev);
if (dev->board_ptr == NULL) {
dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
Expand Down
16 changes: 8 additions & 8 deletions drivers/staging/comedi/drivers/amplc_pci224.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1443,16 +1443,16 @@ static int pci224_attach_common(struct comedi_device *dev,

static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
struct pci224_private *devpriv;
struct pci_dev *pci_dev;
int ret;

dev_info(dev->class_dev, DRIVER_NAME ": attach\n");

ret = alloc_private(dev, sizeof(struct pci224_private));
if (ret < 0) {
dev_err(dev->class_dev, "error! out of memory!\n");
ret = alloc_private(dev, sizeof(*devpriv));
if (ret)
return ret;
}
devpriv = dev->private;

pci_dev = pci224_find_pci_dev(dev, it);
if (!pci_dev)
Expand All @@ -1464,16 +1464,16 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int __devinit
pci224_attach_pci(struct comedi_device *dev, struct pci_dev *pci_dev)
{
struct pci224_private *devpriv;
int ret;

dev_info(dev->class_dev, DRIVER_NAME ": attach_pci %s\n",
pci_name(pci_dev));

ret = alloc_private(dev, sizeof(struct pci224_private));
if (ret < 0) {
dev_err(dev->class_dev, "error! out of memory!\n");
ret = alloc_private(dev, sizeof(*devpriv));
if (ret)
return ret;
}
devpriv = dev->private;

dev->board_ptr = pci224_find_pci_board(pci_dev);
if (dev->board_ptr == NULL) {
Expand Down
16 changes: 9 additions & 7 deletions drivers/staging/comedi/drivers/amplc_pci230.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2662,13 +2662,11 @@ static int pci230_alloc_private(struct comedi_device *dev)
struct pci230_private *devpriv;
int err;

/* sets dev->private to allocated memory */
err = alloc_private(dev, sizeof(struct pci230_private));
if (err) {
dev_err(dev->class_dev, "error! out of memory!\n");
err = alloc_private(dev, sizeof(*devpriv));
if (err)
return err;
}
devpriv = dev->private;

spin_lock_init(&devpriv->isr_spinlock);
spin_lock_init(&devpriv->res_spinlock);
spin_lock_init(&devpriv->ai_stop_spinlock);
Expand Down Expand Up @@ -2836,9 +2834,11 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)

dev_info(dev->class_dev, "amplc_pci230: attach %s %d,%d\n",
thisboard->name, it->options[0], it->options[1]);
rc = pci230_alloc_private(dev); /* sets dev->private */

rc = pci230_alloc_private(dev);
if (rc)
return rc;

pci_dev = pci230_find_pci_dev(dev, it);
if (!pci_dev)
return -EIO;
Expand All @@ -2852,9 +2852,11 @@ static int __devinit pci230_attach_pci(struct comedi_device *dev,

dev_info(dev->class_dev, "amplc_pci230: attach pci %s\n",
pci_name(pci_dev));
rc = pci230_alloc_private(dev); /* sets dev->private */

rc = pci230_alloc_private(dev);
if (rc)
return rc;

dev->board_ptr = pci230_find_pci_board(pci_dev);
if (dev->board_ptr == NULL) {
dev_err(dev->class_dev,
Expand Down
7 changes: 5 additions & 2 deletions drivers/staging/comedi/drivers/cb_das16_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ static int das16cs_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
const struct das16cs_board *thisboard;
struct das16cs_private *devpriv;
struct pcmcia_device *link;
struct comedi_subdevice *s;
int ret;
Expand All @@ -451,8 +452,10 @@ static int das16cs_attach(struct comedi_device *dev,
return ret;
dev->irq = link->irq;

if (alloc_private(dev, sizeof(struct das16cs_private)) < 0)
return -ENOMEM;
ret = alloc_private(dev, sizeof(*devpriv));
if (ret)
return ret;
devpriv = dev->private;

ret = comedi_alloc_subdevices(dev, 3);
if (ret)
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/comedi_parport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ static int parport_attach(struct comedi_device *dev,
return ret;

ret = alloc_private(dev, sizeof(*devpriv));
if (ret < 0)
if (ret)
return ret;
devpriv = dev->private;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/comedi_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ static int waveform_attach(struct comedi_device *dev,
dev->board_name = dev->driver->driver_name;

ret = alloc_private(dev, sizeof(*devpriv));
if (ret < 0)
if (ret)
return ret;
devpriv = dev->private;

Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/daqboard2000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,8 +707,8 @@ static int daqboard2000_attach_pci(struct comedi_device *dev,
dev->board_name = board->name;

result = alloc_private(dev, sizeof(*devpriv));
if (result < 0)
return -ENOMEM;
if (result)
return result;
devpriv = dev->private;

result = comedi_pci_enable(pcidev, dev->driver->driver_name);
Expand Down
12 changes: 8 additions & 4 deletions drivers/staging/comedi/drivers/das08.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -778,14 +778,18 @@ das08_find_pci_board(struct pci_dev *pdev)
static int __devinit __maybe_unused
das08_attach_pci(struct comedi_device *dev, struct pci_dev *pdev)
{
struct das08_private_struct *devpriv;
unsigned long iobase;
int ret;

if (!DO_PCI)
return -EINVAL;
ret = alloc_private(dev, sizeof(struct das08_private_struct));
if (ret < 0)

ret = alloc_private(dev, sizeof(*devpriv));
if (ret)
return ret;
devpriv = dev->private;

dev_info(dev->class_dev, "attach pci %s\n", pci_name(pdev));
dev->board_ptr = das08_find_pci_board(pdev);
if (dev->board_ptr == NULL) {
Expand All @@ -812,8 +816,8 @@ das08_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int ret;
unsigned long iobase;

ret = alloc_private(dev, sizeof(struct das08_private_struct));
if (ret < 0)
ret = alloc_private(dev, sizeof(*devpriv));
if (ret)
return ret;
devpriv = dev->private;

Expand Down
6 changes: 4 additions & 2 deletions drivers/staging/comedi/drivers/das08_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,15 @@ static int das08_cs_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
const struct das08_board_struct *thisboard = comedi_board(dev);
struct das08_private_struct *devpriv;
int ret;
unsigned long iobase;
struct pcmcia_device *link = cur_dev; /* XXX hack */

ret = alloc_private(dev, sizeof(struct das08_private_struct));
if (ret < 0)
ret = alloc_private(dev, sizeof(*devpriv));
if (ret)
return ret;
devpriv = dev->private;

dev_info(dev->class_dev, "das08_cs: attach\n");
/* deal with a pci board */
Expand Down
Loading

0 comments on commit 9a1a6cf

Please sign in to comment.