From: Hannes Reinecke <hare@suse.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Guenther Roeck <linux@roeck-us.net>, Tejun Heo <tj@kernel.org>,
linux-block@vger.kernel.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH] sata_fsl: fixup compilation errors
Date: Fri, 13 Mar 2020 16:17:22 +0100 [thread overview]
Message-ID: <20200313151722.74659-1-hare@suse.de> (raw)
Fixup compilation errors introduced by the libata DPRINTK rewrite.
Fixes: d9cbc6ab0938 ("sata_fsl: move DPRINTK to ata debugging")
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/ata/sata_fsl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 730f6701052c..45c15c4e9f8a 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -315,7 +315,7 @@ static void fsl_sata_set_irq_coalescing(struct ata_host *host,
"%s: interrupt coalescing, count = 0x%x, ticks = %x\n",
__func__, intr_coalescing_count, intr_coalescing_ticks);
dev_dbg(host->dev,
- "%s: ICC register status: (hcr base: 0x%x) = 0x%x\n",
+ "%s: ICC register status: (hcr base: 0x%p) = 0x%x\n",
__func__, hcr_base, ioread32(hcr_base + ICC));
}
@@ -1381,7 +1381,7 @@ static int sata_fsl_init_controller(struct ata_host *host)
* callback, that should also initiate the OOB, COMINIT sequence
*/
- ata_port_dbg(ap, "HStatus = 0x%x HControl = 0x%x\n",
+ dev_dbg(host->dev, "HStatus = 0x%x HControl = 0x%x\n",
ioread32(hcr_base + HSTATUS),
ioread32(hcr_base + HCONTROL));
@@ -1462,7 +1462,7 @@ static int sata_fsl_probe(struct platform_device *ofdev)
iowrite32(temp | TRANSCFG_RX_WATER_MARK, csr_base + TRANSCFG);
}
- ata_port_dbg(ap, "@reset i/o = 0x%x\n", ioread32(csr_base + TRANSCFG));
+ dev_dbg(&ofdev->dev, "@reset i/o = 0x%x\n", ioread32(csr_base + TRANSCFG));
host_priv = kzalloc(sizeof(struct sata_fsl_host_priv), GFP_KERNEL);
if (!host_priv)
--
2.16.4
next reply other threads:[~2020-03-13 15:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 15:17 Hannes Reinecke [this message]
2020-03-13 15:21 ` [PATCH] sata_fsl: fixup compilation errors Jens Axboe
2020-03-13 15:27 ` Hannes Reinecke
2020-03-13 16:33 ` Jens Axboe
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=20200313151722.74659-1-hare@suse.de \
--to=hare@suse.de \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=tj@kernel.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