6 files changed, 2 insertions, 29 deletions
diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py
index 42ac48b..0168875 100644
--- a/decoders/avr_isp/pd.py
+++ b/decoders/avr_isp/pd.py
@@ -30,11 +30,8 @@ class Decoder(srd.Decoder):
     longname = 'AVR In-System Programming'
     desc = 'Protocol for in-system programming Atmel AVR MCUs.'
     license = 'gplv2+'
-    inputs = ['spi', 'logic']
+    inputs = ['spi']
     outputs = ['avr_isp']
-    optional_probes = (
-        {'id': 'reset', 'name': 'RESET#', 'desc': 'Target AVR MCU reset'},
-    )
     annotations = (
         ('pe', 'Programming enable'),
         ('rsb0', 'Read signature byte 0'),
diff --git a/decoders/lm75/pd.py b/decoders/lm75/pd.py
index 1fe03a6..bdd8cb0 100644
--- a/decoders/lm75/pd.py
+++ b/decoders/lm75/pd.py
@@ -48,12 +48,6 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['lm75']
-    optional_probes = (
-        {'id': 'os', 'name': 'OS', 'desc': 'Overtemperature shutdown'},
-        {'id': 'a0', 'name': 'A0', 'desc': 'I²C slave address input 0'},
-        {'id': 'a1', 'name': 'A1', 'desc': 'I²C slave address input 1'},
-        {'id': 'a2', 'name': 'A2', 'desc': 'I²C slave address input 2'},
-    )
     options = (
         {'id': 'sensor', 'desc': 'Sensor type', 'default': 'lm75'},
         {'id': 'resolution', 'desc': 'Resolution', 'default': 9,
diff --git a/decoders/maxim_ds28ea00/pd.py b/decoders/maxim_ds28ea00/pd.py
index 2492c6b..9f120ae 100644
--- a/decoders/maxim_ds28ea00/pd.py
+++ b/decoders/maxim_ds28ea00/pd.py
@@ -44,12 +44,6 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['onewire_network']
     outputs = ['maxim_ds28ea00']
-    optional_probes = (
-        {'id': 'pioa', 'name': 'PIOA/DONE#',
-         'desc': 'PIOA channel and chain output'},
-        {'id': 'piob', 'name': 'PIOB/EN#',
-         'desc': 'PIOB channel and chain output'},
-    )
     annotations = (
         ('text', 'Human-readable text'),
     )
diff --git a/decoders/mx25lxx05d/pd.py b/decoders/mx25lxx05d/pd.py
index 2a4fa61..1099953 100644
--- a/decoders/mx25lxx05d/pd.py
+++ b/decoders/mx25lxx05d/pd.py
@@ -89,12 +89,8 @@ class Decoder(srd.Decoder):
     longname = 'Macronix MX25Lxx05D'
     desc = 'SPI (NOR) flash chip protocol.'
     license = 'gplv2+'
-    inputs = ['spi', 'logic']
+    inputs = ['logic']
     outputs = ['mx25lxx05d']
-    optional_probes = (
-        {'id': 'hold', 'name': 'HOLD#', 'desc': 'Pause device w/o deselecting it'},
-        {'id': 'wp_acc', 'name': 'WP#/ACC', 'desc': 'Write protect'},
-    )
     annotations = cmd_annotation_classes() + (
         ('bits', 'Bits'),
         ('bits2', 'Bits2'),
diff --git a/decoders/mxc6225xu/pd.py b/decoders/mxc6225xu/pd.py
index c1a2a81..67656a9 100644
--- a/decoders/mxc6225xu/pd.py
+++ b/decoders/mxc6225xu/pd.py
@@ -68,9 +68,6 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['mxc6225xu']
-    optional_probes = (
-        {'id': 'int', 'name': 'INT', 'desc': 'DTOS interrupt output pin'},
-    )
     annotations = (
         ('text', 'Human-readable text'),
     )
diff --git a/decoders/rtc8564/pd.py b/decoders/rtc8564/pd.py
index 41cff0d..47bb5d5 100644
--- a/decoders/rtc8564/pd.py
+++ b/decoders/rtc8564/pd.py
@@ -40,11 +40,6 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['rtc8564']
-    optional_probes = (
-        {'id': 'clkout', 'name': 'CLKOUT', 'desc': 'Clock output'},
-        {'id': 'clkoe', 'name': 'CLKOE', 'desc': 'Clock output enable'},
-        {'id': 'int', 'name': 'INT#', 'desc': 'Interrupt'},
-    )
     annotations = reg_list() + (
         ('read', 'Read date/time'),
         ('write', 'Write date/time'),