Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 337197
b: refs/heads/master
c: c34fa26
h: refs/heads/master
i:
  337195: c7036e4
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 24, 2012
1 parent efcb7b9 commit 959eff1
Show file tree
Hide file tree
Showing 81 changed files with 337 additions and 357 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a51d02067efc069aab14b221b625bd82d8e659dd
refs/heads/master: c34fa261b0ac3a862ccd3f71ee55a16b920dfc83
8 changes: 0 additions & 8 deletions trunk/drivers/staging/comedi/comedidev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,14 +415,6 @@ struct comedi_lrange {

/* some silly little inline functions */

static inline int alloc_private(struct comedi_device *dev, int size)
{
dev->private = kzalloc(size, GFP_KERNEL);
if (!dev->private)
return -ENOMEM;
return 0;
}

static inline unsigned int bytes_per_sample(const struct comedi_subdevice *subd)
{
if (subd->subdev_flags & SDF_LSAMPL)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/8255_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,10 @@ static int pci_8255_attach_pci(struct comedi_device *dev,
dev->board_ptr = board;
dev->board_name = board->name;

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

ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1482,10 +1482,10 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned char pci_bus, pci_slot, pci_func;
int i_Dma = 0;

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

if (!pci_list_builded) {
v_pci_card_list_init(this_board->i_VendorId, 1); /* 1 for displaying the list.. */
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/adl_pci6208.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,10 @@ static int pci6208_attach_pci(struct comedi_device *dev,
dev->board_ptr = boardinfo;
dev->board_name = boardinfo->name;

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

ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/adl_pci9111.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -889,10 +889,10 @@ static int pci9111_attach_pci(struct comedi_device *dev,
comedi_set_hw_dev(dev, &pcidev->dev);
dev->board_name = dev->driver->driver_name;

ret = alloc_private(dev, sizeof(*dev_private));
if (ret)
return ret;
dev_private = dev->private;
dev_private = kzalloc(sizeof(*dev_private), GFP_KERNEL);
if (!dev_private)
return -ENOMEM;
dev->private = dev_private;

ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/adl_pci9118.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1923,10 +1923,10 @@ static int pci9118_attach(struct comedi_device *dev,
else
master = 1;

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

pcidev = pci9118_find_pci(dev, it);
if (!pcidev)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/adq12b.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,10 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}
dev->iobase = iobase;

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

devpriv->unipolar = unipolar;
devpriv->differential = differential;
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/adv_pci1710.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1273,10 +1273,10 @@ static int pci1710_attach_pci(struct comedi_device *dev,
dev->board_ptr = this_board;
dev->board_name = this_board->name;

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

ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/adv_pci1723.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,10 @@ static int pci1723_attach_pci(struct comedi_device *dev,
comedi_set_hw_dev(dev, &pcidev->dev);
dev->board_name = dev->driver->driver_name;

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

ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/adv_pci_dio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1108,10 +1108,10 @@ static int pci_dio_attach_pci(struct comedi_device *dev,
dev->board_ptr = this_board;
dev->board_name = this_board->name;

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

ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/aio_aio12_8.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,10 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
}
dev->iobase = iobase;

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

ret = comedi_alloc_subdevices(dev, 4);
if (ret)
Expand Down
17 changes: 8 additions & 9 deletions trunk/drivers/staging/comedi/drivers/amplc_dio200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1339,10 +1339,10 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)

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

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

/* Process options and reserve resources according to bus type. */
if (is_isa_board(thisboard)) {
Expand Down Expand Up @@ -1378,18 +1378,17 @@ 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(*devpriv));
if (ret)
return ret;
devpriv = dev->private;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;

dev->board_ptr = dio200_find_pci_board(pci_dev);
if (dev->board_ptr == NULL) {
Expand Down
17 changes: 8 additions & 9 deletions trunk/drivers/staging/comedi/drivers/amplc_pc236.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,10 +510,10 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)

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

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

/* Process options according to bus type. */
if (is_isa_board(thisboard)) {
Expand Down Expand Up @@ -546,18 +546,17 @@ 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(*devpriv));
if (ret)
return ret;
devpriv = dev->private;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;

dev->board_ptr = pc236_find_pci_board(pci_dev);
if (dev->board_ptr == NULL) {
Expand Down
18 changes: 8 additions & 10 deletions trunk/drivers/staging/comedi/drivers/amplc_pci224.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1445,14 +1445,13 @@ 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(*devpriv));
if (ret)
return ret;
devpriv = dev->private;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;

pci_dev = pci224_find_pci_dev(dev, it);
if (!pci_dev)
Expand All @@ -1465,15 +1464,14 @@ 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(*devpriv));
if (ret)
return ret;
devpriv = dev->private;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;

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

err = alloc_private(dev, sizeof(*devpriv));
if (err)
return err;
devpriv = dev->private;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;

spin_lock_init(&devpriv->isr_spinlock);
spin_lock_init(&devpriv->res_spinlock);
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,10 +452,10 @@ static int das16cs_attach(struct comedi_device *dev,
return ret;
dev->irq = link->irq;

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

ret = comedi_alloc_subdevices(dev, 3);
if (ret)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_pcidas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1486,10 +1486,10 @@ static int cb_pcidas_attach_pci(struct comedi_device *dev,
dev->board_ptr = thisboard;
dev->board_name = thisboard->name;

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

ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1688,10 +1688,10 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
uint32_t local_range, local_decode;
int retval;

retval = alloc_private(dev, sizeof(*devpriv));
if (retval)
return retval;
devpriv = dev->private;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
return -ENOMEM;
dev->private = devpriv;

pcidev = cb_pcidas64_find_pci_dev(dev, it);
if (!pcidev)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_pcidda.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,10 +664,10 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,
dev->board_ptr = thisboard;
dev->board_name = thisboard->name;

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

ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_pcimdas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,10 @@ static int cb_pcimdas_attach_pci(struct comedi_device *dev,

dev->board_name = dev->driver->driver_name;

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

ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ static int cb_pcimdda_attach_pci(struct comedi_device *dev,
comedi_set_hw_dev(dev, &pcidev->dev);
dev->board_name = dev->driver->driver_name;

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

ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
Expand Down
Loading

0 comments on commit 959eff1

Please sign in to comment.