staging: dgnc: delete dgnc_pci.h

Move the few #defines we actually use into the dgnc_driver.c file, no
need to have a .h file for a driver that is only used by a single .c
file.

Cc: Lidza Louina <lidza.louina@gmail.com>
Cc: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c
index a6a4119f083b127f0558569eb0d58c4d5998e9f3..1174aeb209a9a95ff63776573e23e316693a3b18 100644 (file)
--- a/drivers/staging/dgnc/dgnc_driver.c
+++ b/drivers/staging/dgnc/dgnc_driver.c
@@ -10,7 +10,6 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include "dgnc_driver.h"
-#include "dgnc_pci.h"
 #include "dgnc_tty.h"
 #include "dgnc_cls.h"
 
@@ -28,6 +27,17 @@ static ulong         dgnc_poll_time; /* Time of next poll */
 static uint            dgnc_poll_stop; /* Used to tell poller to stop */
 static struct timer_list dgnc_poll_timer;
 
+#define DIGI_VID                               0x114F
+#define PCI_DEVICE_CLASSIC_4_DID               0x0028
+#define PCI_DEVICE_CLASSIC_8_DID               0x0029
+#define PCI_DEVICE_CLASSIC_4_422_DID           0x00D0
+#define PCI_DEVICE_CLASSIC_8_422_DID           0x00D1
+
+#define PCI_DEVICE_CLASSIC_4_PCI_NAME          "ClassicBoard 4 PCI"
+#define PCI_DEVICE_CLASSIC_8_PCI_NAME          "ClassicBoard 8 PCI"
+#define PCI_DEVICE_CLASSIC_4_422_PCI_NAME      "ClassicBoard 4 422 PCI"
+#define PCI_DEVICE_CLASSIC_8_422_PCI_NAME      "ClassicBoard 8 422 PCI"
+
 static const struct pci_device_id dgnc_pci_tbl[] = {
        {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_DID),     .driver_data = 0},
        {PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_422_DID), .driver_data = 1},

diff --git a/drivers/staging/dgnc/dgnc_pci.h b/drivers/staging/dgnc/dgnc_pci.h
deleted file mode 100644 (file)
index 33595fa..0000000
--- a/drivers/staging/dgnc/dgnc_pci.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2003 Digi International (www.digi.com)
- *     Scott H Kilau <Scott_Kilau at digi dot com>
- */
-
-#ifndef _DGNC_PCI_H
-#define _DGNC_PCI_H
-
-/* Maximum number of PCI boards */
-#define PCIMAX 32
-
-#define DIGI_VID                               0x114F
-
-#define PCI_DEVICE_CLASSIC_4_DID               0x0028
-#define PCI_DEVICE_CLASSIC_8_DID               0x0029
-#define PCI_DEVICE_CLASSIC_4_422_DID           0x00D0
-#define PCI_DEVICE_CLASSIC_8_422_DID           0x00D1
-
-#define PCI_DEVICE_CLASSIC_4_PCI_NAME          "ClassicBoard 4 PCI"
-#define PCI_DEVICE_CLASSIC_8_PCI_NAME          "ClassicBoard 8 PCI"
-#define PCI_DEVICE_CLASSIC_4_422_PCI_NAME      "ClassicBoard 4 422 PCI"
-#define PCI_DEVICE_CLASSIC_8_422_PCI_NAME      "ClassicBoard 8 422 PCI"
-
-/* Size of memory and I/O for PCI (4 K) */
-#define PCI_RAM_SIZE                           0x1000
-
-/* Size of memory (2MB) */
-#define PCI_MEM_SIZE                           0x1000
-
-#endif /* _DGNC_PCI_H */