From: Alexander Shiyan <shc_work@mail.ru>
To: barebox@lists.infradead.org
Subject: [PATCH] ATA: platform_ide: Fix patch "driver: replace dev_request_mem_region with dev_request_mem_resource" dev_request_mem_region with dev_request_mem_resource" The driver trying to use memory resource, then IO resource. The ALT register is optional.
Date: Thu, 19 May 2016 20:19:08 +0300 [thread overview]
Message-ID: <1463678348-9046-1-git-send-email-shc_work@mail.ru> (raw)
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
drivers/ata/intf_platform_ide.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
index c3af083..15f5c0a 100644
--- a/drivers/ata/intf_platform_ide.c
+++ b/drivers/ata/intf_platform_ide.c
@@ -104,17 +104,13 @@ static int platform_ide_probe(struct device_d *dev)
}
iores = dev_request_mem_resource(dev, 0);
- if (IS_ERR(iores))
- return PTR_ERR(iores);
- reg_base = IOMEM(iores->start);
-
- if (!IS_ERR(reg_base)) {
+ if (!IS_ERR(iores)) {
+ reg_base = IOMEM(iores->start);
mmio = 1;
iores = dev_request_mem_resource(dev, 1);
- if (IS_ERR(iores))
- return PTR_ERR(iores);
- alt_base = IOMEM(iores->start);
- if (IS_ERR(alt_base))
+ if (!IS_ERR(iores))
+ alt_base = IOMEM(iores->start);
+ else
alt_base = NULL;
} else {
reg = dev_get_resource(dev, IORESOURCE_IO, 0);
--
2.4.9
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2016-05-19 17:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-19 17:19 Alexander Shiyan [this message]
2016-05-23 6:27 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463678348-9046-1-git-send-email-shc_work@mail.ru \
--to=shc_work@mail.ru \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox