projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
staging: comedi: amplc_dio200: remove 'bustype' from boardinfo
[cascardo/linux.git]
/
drivers
/
staging
/
comedi
/
drivers
/
amplc_dio200_pci.c
diff --git
a/drivers/staging/comedi/drivers/amplc_dio200_pci.c
b/drivers/staging/comedi/drivers/amplc_dio200_pci.c
index
fbf0568
..
e1e62a3
100644
(file)
--- a/
drivers/staging/comedi/drivers/amplc_dio200_pci.c
+++ b/
drivers/staging/comedi/drivers/amplc_dio200_pci.c
@@
-243,7
+243,6
@@
enum dio200_pci_model {
static const struct dio200_board dio200_pci_boards[] = {
[pci215_model] = {
.name = "pci215",
static const struct dio200_board dio200_pci_boards[] = {
[pci215_model] = {
.name = "pci215",
- .bustype = pci_bustype,
.mainbar = 2,
.mainsize = DIO200_IO_SIZE,
.layout = {
.mainbar = 2,
.mainsize = DIO200_IO_SIZE,
.layout = {
@@
-256,7
+255,6
@@
static const struct dio200_board dio200_pci_boards[] = {
},
[pci272_model] = {
.name = "pci272",
},
[pci272_model] = {
.name = "pci272",
- .bustype = pci_bustype,
.mainbar = 2,
.mainsize = DIO200_IO_SIZE,
.layout = {
.mainbar = 2,
.mainsize = DIO200_IO_SIZE,
.layout = {
@@
-268,7
+266,6
@@
static const struct dio200_board dio200_pci_boards[] = {
},
[pcie215_model] = {
.name = "pcie215",
},
[pcie215_model] = {
.name = "pcie215",
- .bustype = pci_bustype,
.mainbar = 1,
.mainshift = 3,
.mainsize = DIO200_PCIE_IO_SIZE,
.mainbar = 1,
.mainshift = 3,
.mainsize = DIO200_PCIE_IO_SIZE,
@@
-285,7
+282,6
@@
static const struct dio200_board dio200_pci_boards[] = {
},
[pcie236_model] = {
.name = "pcie236",
},
[pcie236_model] = {
.name = "pcie236",
- .bustype = pci_bustype,
.mainbar = 1,
.mainshift = 3,
.mainsize = DIO200_PCIE_IO_SIZE,
.mainbar = 1,
.mainshift = 3,
.mainsize = DIO200_PCIE_IO_SIZE,
@@
-302,7
+298,6
@@
static const struct dio200_board dio200_pci_boards[] = {
},
[pcie296_model] = {
.name = "pcie296",
},
[pcie296_model] = {
.name = "pcie296",
- .bustype = pci_bustype,
.mainbar = 1,
.mainshift = 3,
.mainsize = DIO200_PCIE_IO_SIZE,
.mainbar = 1,
.mainshift = 3,
.mainsize = DIO200_PCIE_IO_SIZE,
@@
-359,7
+354,6
@@
static int dio200_pci_auto_attach(struct comedi_device *dev,
{
struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
const struct dio200_board *thisboard = NULL;
{
struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
const struct dio200_board *thisboard = NULL;
- struct dio200_private *devpriv;
unsigned int bar;
int ret;
unsigned int bar;
int ret;
@@
-373,10
+367,6
@@
static int dio200_pci_auto_attach(struct comedi_device *dev,
dev_info(dev->class_dev, "%s: attach pci %s (%s)\n",
dev->driver->driver_name, pci_name(pci_dev), dev->board_name);
dev_info(dev->class_dev, "%s: attach pci %s (%s)\n",
dev->driver->driver_name, pci_name(pci_dev), dev->board_name);
- devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
- if (!devpriv)
- return -ENOMEM;
-
ret = comedi_pci_enable(dev);
if (ret)
return ret;
ret = comedi_pci_enable(dev);
if (ret)
return ret;