[PATCH] sata_fsl: fixup compilation errors

[PATCH] sata_fsl: fixup compilation errors

[Hannes Reinecke]

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

Re: [PATCH] sata_fsl: fixup compilation errors

[Jens Axboe]

On 3/13/20 9:17 AM, Hannes Reinecke wrote:
> Fixup compilation errors introduced by the libata DPRINTK rewrite.

How many more are we going to uncover? There's no excuse for not
having even compiled this stuff, seriously.

-- 
Jens Axboe

Re: [PATCH] sata_fsl: fixup compilation errors

[Hannes Reinecke]

On 3/13/20 4:21 PM, Jens Axboe wrote:
> On 3/13/20 9:17 AM, Hannes Reinecke wrote:
>> Fixup compilation errors introduced by the libata DPRINTK rewrite.
> 
> How many more are we going to uncover? There's no excuse for not
> having even compiled this stuff, seriously.
> 
Well, I did, but I don't have a full cross-arch setup here.
Will be setting it up for any further libata updates, promise.

Sorry about this.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke            Teamlead Storage & Networking
hare@suse.de                               +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer

Re: [PATCH] sata_fsl: fixup compilation errors

[Jens Axboe]

On 3/13/20 9:27 AM, Hannes Reinecke wrote:
> On 3/13/20 4:21 PM, Jens Axboe wrote:
>> On 3/13/20 9:17 AM, Hannes Reinecke wrote:
>>> Fixup compilation errors introduced by the libata DPRINTK rewrite.
>>
>> How many more are we going to uncover? There's no excuse for not
>> having even compiled this stuff, seriously.
>>
> Well, I did, but I don't have a full cross-arch setup here.
> Will be setting it up for any further libata updates, promise.

If there's something you can even compile test, you should (at the
very least)

- Eye ball those individual patches very carefully
- Preferably get setup so you can

Looks like basically all the files you didn't compile had stupid
errors, which makes me think that the rest probably did too, but
you caught those since they actually compiled. That should be a
very strong hint that you may have the same typos in those, and
that you should examine particularly those carefully. Mistakes
happen, but this just appeared to be super sloppy.

-- 
Jens Axboe