Commit 0500ce58 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Alexandre Belloni

rtc: m48t86: remove unused platform_data

All users of this driver have been updated to allow the driver to
manage it's own resources and do the read/write operations internally.
The m48t86_ops are no longer used.

Remove the platform_data header and the support code in the driver.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 8ccbd360
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/platform_data/rtc-m48t86.h>
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/io.h> #include <linux/io.h>
...@@ -45,7 +44,6 @@ struct m48t86_rtc_info { ...@@ -45,7 +44,6 @@ struct m48t86_rtc_info {
void __iomem *index_reg; void __iomem *index_reg;
void __iomem *data_reg; void __iomem *data_reg;
struct rtc_device *rtc; struct rtc_device *rtc;
struct m48t86_ops *ops;
}; };
static unsigned char m48t86_readb(struct device *dev, unsigned long addr) static unsigned char m48t86_readb(struct device *dev, unsigned long addr)
...@@ -53,12 +51,9 @@ static unsigned char m48t86_readb(struct device *dev, unsigned long addr) ...@@ -53,12 +51,9 @@ static unsigned char m48t86_readb(struct device *dev, unsigned long addr)
struct m48t86_rtc_info *info = dev_get_drvdata(dev); struct m48t86_rtc_info *info = dev_get_drvdata(dev);
unsigned char value; unsigned char value;
if (info->ops) { writeb(addr, info->index_reg);
value = info->ops->readbyte(addr); value = readb(info->data_reg);
} else {
writeb(addr, info->index_reg);
value = readb(info->data_reg);
}
return value; return value;
} }
...@@ -67,12 +62,8 @@ static void m48t86_writeb(struct device *dev, ...@@ -67,12 +62,8 @@ static void m48t86_writeb(struct device *dev,
{ {
struct m48t86_rtc_info *info = dev_get_drvdata(dev); struct m48t86_rtc_info *info = dev_get_drvdata(dev);
if (info->ops) { writeb(addr, info->index_reg);
info->ops->writebyte(value, addr); writeb(value, info->data_reg);
} else {
writeb(addr, info->index_reg);
writeb(value, info->data_reg);
}
} }
static int m48t86_rtc_read_time(struct device *dev, struct rtc_time *tm) static int m48t86_rtc_read_time(struct device *dev, struct rtc_time *tm)
...@@ -235,30 +226,26 @@ static bool m48t86_verify_chip(struct platform_device *pdev) ...@@ -235,30 +226,26 @@ static bool m48t86_verify_chip(struct platform_device *pdev)
static int m48t86_rtc_probe(struct platform_device *pdev) static int m48t86_rtc_probe(struct platform_device *pdev)
{ {
struct m48t86_rtc_info *info; struct m48t86_rtc_info *info;
struct resource *res;
unsigned char reg; unsigned char reg;
info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL); info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
if (!info) if (!info)
return -ENOMEM; return -ENOMEM;
info->ops = dev_get_platdata(&pdev->dev); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!info->ops) { if (!res)
struct resource *res; return -ENODEV;
info->index_reg = devm_ioremap_resource(&pdev->dev, res);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (IS_ERR(info->index_reg))
if (!res) return PTR_ERR(info->index_reg);
return -ENODEV;
info->index_reg = devm_ioremap_resource(&pdev->dev, res); res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (IS_ERR(info->index_reg)) if (!res)
return PTR_ERR(info->index_reg); return -ENODEV;
info->data_reg = devm_ioremap_resource(&pdev->dev, res);
res = platform_get_resource(pdev, IORESOURCE_MEM, 1); if (IS_ERR(info->data_reg))
if (!res) return PTR_ERR(info->data_reg);
return -ENODEV;
info->data_reg = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(info->data_reg))
return PTR_ERR(info->data_reg);
}
dev_set_drvdata(&pdev->dev, info); dev_set_drvdata(&pdev->dev, info);
......
/*
* ST M48T86 / Dallas DS12887 RTC driver
* Copyright (c) 2006 Tower Technologies
*
* Author: Alessandro Zummo <a.zummo@towertech.it>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
struct m48t86_ops
{
void (*writebyte)(unsigned char value, unsigned long addr);
unsigned char (*readbyte)(unsigned long addr);
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment