diff --git a/[refs] b/[refs] index 99824853884c..d492805127f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 807856bf94385cf6f94e3254c289b3574d2e9948 +refs/heads/master: 8f9c5b7032df0210c464a0fbb9a93654310da54a diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci7230.c b/trunk/drivers/staging/comedi/drivers/adl_pci7230.c index cdf3949024c2..7df4c960d5e4 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci7230.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci7230.c @@ -42,12 +42,6 @@ Configuration Options: #define PCI_DEVICE_ID_PCI7230 0x7230 -struct adl_pci7230_private { - int data; -}; - -#define devpriv ((struct adl_pci7230_private *)dev->private) - static int adl_pci7230_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, @@ -108,9 +102,6 @@ static int adl_pci7230_attach(struct comedi_device *dev, dev->board_name = "pci7230"; - if (alloc_private(dev, sizeof(struct adl_pci7230_private)) < 0) - return -ENOMEM; - ret = comedi_alloc_subdevices(dev, 2); if (ret) return ret;