Merge tag 'char-misc-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver patches from Greg KH:
 "Here's the big char/misc driver patches for 3.14-rc1.

  Lots of little things, and a new "big" driver, genwqe.  Full details
  are in the shortlog"

* tag 'char-misc-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (90 commits)
  mei: limit the number of consecutive resets
  mei: revamp mei reset state machine
  drivers/char: don't use module_init in non-modular ttyprintk.c
  VMCI: fix error handling path when registering guest driver
  extcon: gpio: Add power resume support
  Documentation: HOWTO: Updates on subsystem trees, patchwork, -next (vs. -mm) in ko_KR
  Documentation: HOWTO: update for 2.6.x -> 3.x versioning in ko_KR
  Documentation: HOWTO: update stable address in ko_KR
  Documentation: HOWTO: update LXR web link in ko_KR
  char: nwbutton: open-code interruptible_sleep_on
  mei: fix syntax in comments and debug output
  mei: nfc: mei_nfc_free has to be called under lock
  mei: use hbm idle state to prevent spurious resets
  mei: do not run reset flow from the interrupt thread
  misc: genwqe: fix return value check in genwqe_device_create()
  GenWQE: Fix warnings for sparc
  GenWQE: Fix compile problems for Alpha
  Documentation/misc-devices/mei/mei-amt-version.c: remove unneeded call of mei_deinit()
  GenWQE: Rework return code for flash-update ioctl
  sgi-xp: open-code interruptible_sleep_on_timeout
  ...

1 files changed, 4 insertions, 16 deletions

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 963761526229..76ee7750bc5e 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -2600,8 +2600,6 @@ enum parport_pc_pci_cards {
         syba_2p_epp,
         syba_1p_ecp,
         titan_010l,
-        titan_1284p1,
-        titan_1284p2,
         avlab_1p,
         avlab_2p,
         oxsemi_952,
@@ -2660,8 +2658,6 @@ static struct parport_pc_pci {
         /* syba_2p_epp AP138B */        { 2, { { 0, 0x078 }, { 0, 0x178 }, } },
         /* syba_1p_ecp W83787 */        { 1, { { 0, 0x078 }, } },
         /* titan_010l */                { 1, { { 3, -1 }, } },
-        /* titan_1284p1 */              { 1, { { 0, 1 }, } },
-        /* titan_1284p2 */              { 2, { { 0, 1 }, { 2, 3 }, } },
         /* avlab_1p             */      { 1, { { 0, 1}, } },
         /* avlab_2p             */      { 2, { { 0, 1}, { 2, 3 },} },
         /* The Oxford Semi cards are unusual: 954 doesn't support ECP,
@@ -2677,8 +2673,8 @@ static struct parport_pc_pci {
         /* netmos_9705 */               { 1, { { 0, -1 }, } },
         /* netmos_9715 */               { 2, { { 0, 1 }, { 2, 3 },} },
         /* netmos_9755 */               { 2, { { 0, 1 }, { 2, 3 },} },
-        /* netmos_9805 */               { 1, { { 0, -1 }, } },
-        /* netmos_9815 */               { 2, { { 0, -1 }, { 2, -1 }, } },
+        /* netmos_9805 */               { 1, { { 0, 1 }, } },
+        /* netmos_9815 */               { 2, { { 0, 1 }, { 2, 3 }, } },
         /* netmos_9901 */               { 1, { { 0, -1 }, } },
         /* netmos_9865 */               { 1, { { 0, -1 }, } },
         /* quatech_sppxp100 */          { 1, { { 0, 1 }, } },
@@ -2722,8 +2718,6 @@ static const struct pci_device_id parport_pc_pci_tbl[] = {
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, syba_1p_ecp },
         { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_010L,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_010l },
-        { 0x9710, 0x9805, 0x1000, 0x0010, 0, 0, titan_1284p1 },
-        { 0x9710, 0x9815, 0x1000, 0x0020, 0, 0, titan_1284p2 },
         /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/
         /* AFAVLAB_TK9902 */
         { 0x14db, 0x2120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1p},
@@ -2827,16 +2821,12 @@ static int parport_pc_pci_probe(struct pci_dev *dev,
                 if (irq == IRQ_NONE) {
                         printk(KERN_DEBUG
         "PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx)\n",
-                                parport_pc_pci_tbl[i + last_sio].vendor,
-                                parport_pc_pci_tbl[i + last_sio].device,
-                                io_lo, io_hi);
+                                id->vendor, id->device, io_lo, io_hi);
                         irq = PARPORT_IRQ_NONE;
                 } else {
                         printk(KERN_DEBUG
         "PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx), IRQ %d\n",
-                                parport_pc_pci_tbl[i + last_sio].vendor,
-                                parport_pc_pci_tbl[i + last_sio].device,
-                                io_lo, io_hi, irq);
+                                id->vendor, id->device, io_lo, io_hi, irq);
                 }
                 data->ports[count] =
                         parport_pc_probe_port(io_lo, io_hi, irq,
@@ -2866,8 +2856,6 @@ static void parport_pc_pci_remove(struct pci_dev *dev)
         struct pci_parport_data *data = pci_get_drvdata(dev);
         int i;
 
-        pci_set_drvdata(dev, NULL);
-
         if (data) {
                 for (i = data->num - 1; i >= 0; i--)
                         parport_pc_unregister_port(data->ports[i]);