macintosh/nvram: Remove as unused
authorFinn Thain <fthain@telegraphics.com.au>
Sun, 31 May 2015 01:01:33 +0000 (11:01 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 15 Jun 2015 06:42:37 +0000 (16:42 +1000)
The full history Linux tree says it was moved:

  commit 17c6f4635bea74e110ab3558d408c9cd218c568a
  Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  Date:   Fri Feb 6 14:20:56 2004 +1100

      ppc32: Rework nvram management

      move drivers/macintosh/nvram.c to drivers/char/generic_nvram.c,
      update platform hooks,
      fix powermac nvram driver for newer machines

But it's still there, and not buildable, so remove it.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
drivers/macintosh/nvram.c [deleted file]

diff --git a/drivers/macintosh/nvram.c b/drivers/macintosh/nvram.c
deleted file mode 100644 (file)
index f0e03e7..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * /dev/nvram driver for Power Macintosh.
- */
-
-#define NVRAM_VERSION "1.0"
-
-#include <linux/module.h>
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/miscdevice.h>
-#include <linux/fcntl.h>
-#include <linux/nvram.h>
-#include <linux/init.h>
-#include <asm/uaccess.h>
-#include <asm/nvram.h>
-
-#define NVRAM_SIZE     8192
-
-static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
-{
-       switch (origin) {
-       case 0:
-               break;
-       case 1:
-               offset += file->f_pos;
-               break;
-       case 2:
-               offset += NVRAM_SIZE;
-               break;
-       default:
-               offset = -1;
-       }
-       if (offset < 0)
-               return -EINVAL;
-
-       file->f_pos = offset;
-       return file->f_pos;
-}
-
-static ssize_t read_nvram(struct file *file, char __user *buf,
-                         size_t count, loff_t *ppos)
-{
-       unsigned int i;
-       char __user *p = buf;
-
-       if (!access_ok(VERIFY_WRITE, buf, count))
-               return -EFAULT;
-       if (*ppos >= NVRAM_SIZE)
-               return 0;
-       for (i = *ppos; count > 0 && i < NVRAM_SIZE; ++i, ++p, --count)
-               if (__put_user(nvram_read_byte(i), p))
-                       return -EFAULT;
-       *ppos = i;
-       return p - buf;
-}
-
-static ssize_t write_nvram(struct file *file, const char __user *buf,
-                          size_t count, loff_t *ppos)
-{
-       unsigned int i;
-       const char __user *p = buf;
-       char c;
-
-       if (!access_ok(VERIFY_READ, buf, count))
-               return -EFAULT;
-       if (*ppos >= NVRAM_SIZE)
-               return 0;
-       for (i = *ppos; count > 0 && i < NVRAM_SIZE; ++i, ++p, --count) {
-               if (__get_user(c, p))
-                       return -EFAULT;
-               nvram_write_byte(c, i);
-       }
-       *ppos = i;
-       return p - buf;
-}
-
-static long nvram_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-{
-       switch(cmd) {
-               case PMAC_NVRAM_GET_OFFSET:
-               {
-                       int part, offset;
-                       if (copy_from_user(&part, (void __user*)arg, sizeof(part)) != 0)
-                               return -EFAULT;
-                       if (part < pmac_nvram_OF || part > pmac_nvram_NR)
-                               return -EINVAL;
-                       offset = pmac_get_partition(part);
-                       if (copy_to_user((void __user*)arg, &offset, sizeof(offset)) != 0)
-                               return -EFAULT;
-                       break;
-               }
-
-               default:
-                       return -EINVAL;
-       }
-
-       return 0;
-}
-
-const struct file_operations nvram_fops = {
-       .owner          = THIS_MODULE,
-       .llseek         = nvram_llseek,
-       .read           = read_nvram,
-       .write          = write_nvram,
-       .unlocked_ioctl = nvram_ioctl,
-};
-
-static struct miscdevice nvram_dev = {
-       NVRAM_MINOR,
-       "nvram",
-       &nvram_fops
-};
-
-int __init nvram_init(void)
-{
-       printk(KERN_INFO "Macintosh non-volatile memory driver v%s\n",
-               NVRAM_VERSION);
-       return misc_register(&nvram_dev);
-}
-
-void __exit nvram_cleanup(void)
-{
-        misc_deregister( &nvram_dev );
-}
-
-module_init(nvram_init);
-module_exit(nvram_cleanup);
-MODULE_LICENSE("GPL");