From: Tejun Heo [EMAIL PROTECTED]
xfer_mask is unsigned int not unsigned long. Change -mode_filter to
take and return unsigned int.
While at it, rename @adev of ata_pci_default_filter() to @dev for
consistency.
[EMAIL PROTECTED]: fix types]
Signed-off-by: Tejun Heo [EMAIL PROTECTED]
Signed-off-by: Andrew Morton [EMAIL PROTECTED]
---
drivers/ata/libata-sff.c |5 +++--
drivers/ata/pata_acpi.c|2 +-
drivers/ata/pata_ali.c |2 +-
drivers/ata/pata_amd.c | 10 +-
drivers/ata/pata_hpt366.c |2 +-
drivers/ata/pata_hpt37x.c |4 ++--
drivers/ata/pata_pdc2027x.c|4 ++--
drivers/ata/pata_scc.c |2 +-
drivers/ata/pata_serverworks.c |4 ++--
include/linux/libata.h |9 +
10 files changed, 23 insertions(+), 21 deletions(-)
diff -puN
drivers/ata/libata-sff.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
drivers/ata/libata-sff.c
---
a/drivers/ata/libata-sff.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
+++ a/drivers/ata/libata-sff.c
@@ -879,12 +879,13 @@ int ata_pci_clear_simplex(struct pci_dev
return 0;
}
-unsigned long ata_pci_default_filter(struct ata_device *adev, unsigned long
xfer_mask)
+unsigned int ata_pci_default_filter(struct ata_device *dev,
+ unsigned int xfer_mask)
{
/* Filter out DMA modes if the device has been configured by
the BIOS as PIO only */
- if (adev-link-ap-ioaddr.bmdma_addr == NULL)
+ if (dev-link-ap-ioaddr.bmdma_addr == NULL)
xfer_mask = ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
return xfer_mask;
}
diff -puN
drivers/ata/pata_acpi.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
drivers/ata/pata_acpi.c
--- a/drivers/ata/pata_acpi.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
+++ a/drivers/ata/pata_acpi.c
@@ -117,7 +117,7 @@ static unsigned long pacpi_discover_mode
* this case the list of discovered valid modes obtained by ACPI probing
*/
-static unsigned long pacpi_mode_filter(struct ata_device *adev, unsigned long
mask)
+static unsigned int pacpi_mode_filter(struct ata_device *adev, unsigned int
mask)
{
struct pata_acpi *acpi = adev-link-ap-private_data;
return ata_pci_default_filter(adev, mask acpi-mask[adev-devno]);
diff -puN
drivers/ata/pata_ali.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
drivers/ata/pata_ali.c
--- a/drivers/ata/pata_ali.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
+++ a/drivers/ata/pata_ali.c
@@ -108,7 +108,7 @@ static int ali_c2_cable_detect(struct at
* fix that later on. Also ensure we do not do UDMA on WDC drives
*/
-static unsigned long ali_20_filter(struct ata_device *adev, unsigned long mask)
+static unsigned int ali_20_filter(struct ata_device *adev, unsigned int mask)
{
char model_num[ATA_ID_PROD_LEN + 1];
/* No DMA on anything but a disk for now */
diff -puN
drivers/ata/pata_hpt366.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
drivers/ata/pata_hpt366.c
---
a/drivers/ata/pata_hpt366.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
+++ a/drivers/ata/pata_hpt366.c
@@ -174,7 +174,7 @@ static int hpt_dma_blacklisted(const str
* Block UDMA on devices that cause trouble with this controller.
*/
-static unsigned long hpt366_filter(struct ata_device *adev, unsigned long mask)
+static unsigned int hpt366_filter(struct ata_device *adev, unsigned int mask)
{
if (adev-class == ATA_DEV_ATA) {
if (hpt_dma_blacklisted(adev, UDMA, bad_ata33))
diff -puN
drivers/ata/pata_hpt37x.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
drivers/ata/pata_hpt37x.c
---
a/drivers/ata/pata_hpt37x.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
+++ a/drivers/ata/pata_hpt37x.c
@@ -275,7 +275,7 @@ static const char *bad_ata100_5[] = {
* Block UDMA on devices that cause trouble with this controller.
*/
-static unsigned long hpt370_filter(struct ata_device *adev, unsigned long mask)
+static unsigned int hpt370_filter(struct ata_device *adev, unsigned int mask)
{
if (adev-class == ATA_DEV_ATA) {
if (hpt_dma_blacklisted(adev, UDMA, bad_ata33))
@@ -293,7 +293,7 @@ static unsigned long hpt370_filter(struc
* Block UDMA on devices that cause trouble with this controller.
*/
-static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long
mask)
+static unsigned int hpt370a_filter(struct ata_device *adev, unsigned int mask)
{
if (adev-class == ATA_DEV_ATA) {
if (hpt_dma_blacklisted(adev, UDMA100, bad_ata100_5))
diff -puN
drivers/ata/pata_pdc2027x.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
drivers/ata/pata_pdc2027x.c
---
a/drivers/ata/pata_pdc2027x.c~libata-xfer_mask-is-unsigned-int-not-unsigned-long
+++ a/drivers/ata/pata_pdc2027x.c
@@ -67,7 +67,7 @@ static void pdc2027x_error_handler(struc
static void pdc2027x_set_piomode(struct ata_port
