2 files changed, 3 insertions, 13 deletions

diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index 45c997430332..4c8c7a620d08 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -614,18 +614,7 @@ static int ide_drivers_show(struct seq_file *s, void *p)
         return 0;
 }
 
-static int ide_drivers_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, &ide_drivers_show, NULL);
-}
-
-static const struct file_operations ide_drivers_operations = {
-        .owner          = THIS_MODULE,
-        .open           = ide_drivers_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(ide_drivers);
 
 void proc_ide_create(void)
 {
@@ -634,7 +623,7 @@ void proc_ide_create(void)
         if (!proc_ide_root)
                 return;
 
-        proc_create("drivers", 0, proc_ide_root, &ide_drivers_operations);
+        proc_create("drivers", 0, proc_ide_root, &ide_drivers_fops);
 }
 
 void proc_ide_destroy(void)
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index c5b902b86b44..203ed4adc04a 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -920,6 +920,7 @@ static u8 pmac_ide_cable_detect(ide_hwif_t *hwif)
         struct device_node *root = of_find_node_by_path("/");
         const char *model = of_get_property(root, "model", NULL);
 
+        of_node_put(root);
         /* Get cable type from device-tree. */
         if (cable && !strncmp(cable, "80-", 3)) {
                 /* Some drives fail to detect 80c cable in PowerBook */