|
@@ -79,7 +79,6 @@
|
|
|
|
|
|
struct vt8500_rtc {
|
|
|
void __iomem *regbase;
|
|
|
- struct resource *res;
|
|
|
int irq_alarm;
|
|
|
struct rtc_device *rtc;
|
|
|
spinlock_t lock; /* Protects this structure */
|
|
@@ -209,6 +208,7 @@ static const struct rtc_class_ops vt8500_rtc_ops = {
|
|
|
static int vt8500_rtc_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct vt8500_rtc *vt8500_rtc;
|
|
|
+ struct resource *res;
|
|
|
int ret;
|
|
|
|
|
|
vt8500_rtc = devm_kzalloc(&pdev->dev,
|
|
@@ -219,34 +219,16 @@ static int vt8500_rtc_probe(struct platform_device *pdev)
|
|
|
spin_lock_init(&vt8500_rtc->lock);
|
|
|
platform_set_drvdata(pdev, vt8500_rtc);
|
|
|
|
|
|
- vt8500_rtc->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
- if (!vt8500_rtc->res) {
|
|
|
- dev_err(&pdev->dev, "No I/O memory resource defined\n");
|
|
|
- return -ENXIO;
|
|
|
- }
|
|
|
-
|
|
|
vt8500_rtc->irq_alarm = platform_get_irq(pdev, 0);
|
|
|
if (vt8500_rtc->irq_alarm < 0) {
|
|
|
dev_err(&pdev->dev, "No alarm IRQ resource defined\n");
|
|
|
return vt8500_rtc->irq_alarm;
|
|
|
}
|
|
|
|
|
|
- vt8500_rtc->res = devm_request_mem_region(&pdev->dev,
|
|
|
- vt8500_rtc->res->start,
|
|
|
- resource_size(vt8500_rtc->res),
|
|
|
- "vt8500-rtc");
|
|
|
- if (vt8500_rtc->res == NULL) {
|
|
|
- dev_err(&pdev->dev, "failed to request I/O memory\n");
|
|
|
- return -EBUSY;
|
|
|
- }
|
|
|
-
|
|
|
- vt8500_rtc->regbase = devm_ioremap(&pdev->dev, vt8500_rtc->res->start,
|
|
|
- resource_size(vt8500_rtc->res));
|
|
|
- if (!vt8500_rtc->regbase) {
|
|
|
- dev_err(&pdev->dev, "Unable to map RTC I/O memory\n");
|
|
|
- ret = -EBUSY;
|
|
|
- goto err_return;
|
|
|
- }
|
|
|
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
+ vt8500_rtc->regbase = devm_ioremap_resource(&pdev->dev, res);
|
|
|
+ if (IS_ERR(vt8500_rtc->regbase))
|
|
|
+ return PTR_ERR(vt8500_rtc->regbase);
|
|
|
|
|
|
/* Enable RTC and set it to 24-hour mode */
|
|
|
writel(VT8500_RTC_CR_ENABLE,
|