From: Andrew Morton drivers/ata/pata_amd.c:521: warning: initialization from incompatible pointer type drivers/ata/pata_amd.c:556: warning: initialization from incompatible pointer type is this right? Cc: Tejun Heo Signed-off-by: Andrew Morton --- drivers/ata/pata_amd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/ata/pata_amd.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long-fix drivers/ata/pata_amd.c --- a/drivers/ata/pata_amd.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long-fix +++ a/drivers/ata/pata_amd.c @@ -225,8 +225,8 @@ static void amd133_set_dmamode(struct at * cached during driver attach and are consulted to select transfer * mode. */ -static unsigned long nv_mode_filter(struct ata_device *dev, - unsigned long xfer_mask) +static unsigned int nv_mode_filter(struct ata_device *dev, + unsigned int xfer_mask) { static const unsigned int udma_mask_map[] = { ATA_UDMA2, ATA_UDMA1, ATA_UDMA0, 0, @@ -235,7 +235,7 @@ static unsigned long nv_mode_filter(stru char acpi_str[32] = ""; u32 saved_udma, udma; const struct ata_acpi_gtm *gtm; - unsigned long bios_limit = 0, acpi_limit = 0, limit; + unsigned int bios_limit = 0, acpi_limit = 0, limit; /* find out what BIOS configured */ udma = saved_udma = (unsigned long)ap->host->private_data; @@ -268,8 +268,8 @@ static unsigned long nv_mode_filter(stru if (!(limit & (ATA_MASK_MWDMA | ATA_MASK_UDMA))) limit |= ATA_MASK_MWDMA | ATA_MASK_UDMA; - ata_port_printk(ap, KERN_DEBUG, "nv_mode_filter: 0x%lx&0x%lx->0x%lx, " - "BIOS=0x%lx (0x%x) ACPI=0x%lx%s\n", + ata_port_printk(ap, KERN_DEBUG, "nv_mode_filter: 0x%x&0x%x->0x%x, " + "BIOS=0x%x (0x%x) ACPI=0x%x%s\n", xfer_mask, limit, xfer_mask & limit, bios_limit, saved_udma, acpi_limit, acpi_str); _