2 files changed, 2 insertions, 15 deletions

diff --git a/drivers/parisc/eisa_eeprom.c b/drivers/parisc/eisa_eeprom.c
index 8c0b26e9b98a..cce00ed81f37 100644
--- a/drivers/parisc/eisa_eeprom.c
+++ b/drivers/parisc/eisa_eeprom.c
@@ -75,17 +75,8 @@ static ssize_t eisa_eeprom_read(struct file * file,
         return ret;
 }
 
-static int eisa_eeprom_ioctl(struct inode *inode, struct file *file, 
-                           unsigned int cmd,
-                           unsigned long arg)
-{
-        return -ENOTTY;
-}
-
 static int eisa_eeprom_open(struct inode *inode, struct file *file)
 {
-        cycle_kernel_lock();
-
         if (file->f_mode & FMODE_WRITE)
                 return -EINVAL;
    
@@ -104,7 +95,6 @@ static const struct file_operations eisa_eeprom_fops = {
         .owner =        THIS_MODULE,
         .llseek =       eisa_eeprom_llseek,
         .read =         eisa_eeprom_read,
-        .ioctl =        eisa_eeprom_ioctl,
         .open =         eisa_eeprom_open,
         .release =      eisa_eeprom_release,
 };
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 9581d3619450..79caf1ca4a29 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -352,11 +352,9 @@ static __inline__ int led_get_net_activity(void)
 
         rx_total = tx_total = 0;
         
-        /* we are running as a workqueue task, so locking dev_base 
-         * for reading should be OK */
-        read_lock(&dev_base_lock);
+        /* we are running as a workqueue task, so we can use an RCU lookup */
         rcu_read_lock();
-        for_each_netdev(&init_net, dev) {
+        for_each_netdev_rcu(&init_net, dev) {
             const struct net_device_stats *stats;
             struct in_device *in_dev = __in_dev_get_rcu(dev);
             if (!in_dev || !in_dev->ifa_list)
@@ -368,7 +366,6 @@ static __inline__ int led_get_net_activity(void)
             tx_total += stats->tx_packets;
         }
         rcu_read_unlock();
-        read_unlock(&dev_base_lock);
 
         retval = 0;