Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[cascardo/linux.git] / drivers / base / dd.c

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 62ec61e..e4ffbcf 100644 (file)
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -587,29 +587,3 @@ void driver_detach(struct device_driver *drv)
                put_device(dev);
        }
 }
-
-/*
- * These exports can't be _GPL due to .h files using this within them, and it
- * might break something that was previously working...
- */
-void *dev_get_drvdata(const struct device *dev)
-{
-       if (dev && dev->p)
-               return dev->p->driver_data;
-       return NULL;
-}
-EXPORT_SYMBOL(dev_get_drvdata);
-
-int dev_set_drvdata(struct device *dev, void *data)
-{
-       int error;
-
-       if (!dev->p) {
-               error = device_private_init(dev);
-               if (error)
-                       return error;
-       }
-       dev->p->driver_data = data;
-       return 0;
-}
-EXPORT_SYMBOL(dev_set_drvdata);