1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index 736c7714f565..c6bd7e84de24 100644
--- a/drivers/misc/carma/carma-fpga-program.c
+++ b/drivers/misc/carma/carma-fpga-program.c
@@ -830,8 +830,9 @@ static ssize_t penable_store(struct device *dev, struct device_attribute *attr,
         unsigned long val;
         int ret;
 
-        if (strict_strtoul(buf, 0, &val))
-                return -EINVAL;
+        ret = kstrtoul(buf, 0, &val);
+        if (ret)
+                return ret;
 
         if (val) {
                 ret = fpga_enable_power_supplies(priv);
@@ -859,8 +860,9 @@ static ssize_t program_store(struct device *dev, struct device_attribute *attr,
         unsigned long val;
         int ret;
 
-        if (strict_strtoul(buf, 0, &val))
-                return -EINVAL;
+        ret = kstrtoul(buf, 0, &val);
+        if (ret)
+                return ret;
 
         /* We can't have an image writer and be programming simultaneously */
         if (mutex_lock_interruptible(&priv->lock))
@@ -919,7 +921,7 @@ static bool dma_filter(struct dma_chan *chan, void *data)
 
 static int fpga_of_remove(struct platform_device *op)
 {
-        struct fpga_dev *priv = dev_get_drvdata(&op->dev);
+        struct fpga_dev *priv = platform_get_drvdata(op);
         struct device *this_device = priv->miscdev.this_device;
 
         sysfs_remove_group(&this_device->kobj, &fpga_attr_group);
@@ -969,7 +971,7 @@ static int fpga_of_probe(struct platform_device *op)
 
         kref_init(&priv->ref);
 
-        dev_set_drvdata(&op->dev, priv);
+        platform_set_drvdata(op, priv);
         priv->dev = &op->dev;
         mutex_init(&priv->lock);
         init_completion(&priv->completion);