diff options
author | Dan McGee <dpmcgee@gmail.com> | 2011-09-07 12:23:22 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2011-10-08 00:07:16 -0400 |
commit | edc7d12ede4333a1fd7b59cebae970b4953ec9d0 (patch) | |
tree | 174f9da5ea06d97c31d0d7de28e5f63d06042520 /drivers/ata | |
parent | c03a476dda0a0b6ef3d2c5bf0dc07e00a1d2322f (diff) |
pata_sis: code style cleanups for consistency
Remove a lot of ' ' (double spaces) as well as ensuring use of tabs vs.
spaces is appropriate and consistent.
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/pata_sis.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index d886b0b782f7..b0edc7de7b2d 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c | |||
@@ -55,7 +55,7 @@ static const struct sis_laptop sis_laptop[] = { | |||
55 | /* devid, subvendor, subdev */ | 55 | /* devid, subvendor, subdev */ |
56 | { 0x5513, 0x1043, 0x1107 }, /* ASUS A6K */ | 56 | { 0x5513, 0x1043, 0x1107 }, /* ASUS A6K */ |
57 | { 0x5513, 0x1734, 0x105F }, /* FSC Amilo A1630 */ | 57 | { 0x5513, 0x1734, 0x105F }, /* FSC Amilo A1630 */ |
58 | { 0x5513, 0x1071, 0x8640 }, /* EasyNote K5305 */ | 58 | { 0x5513, 0x1071, 0x8640 }, /* EasyNote K5305 */ |
59 | /* end marker */ | 59 | /* end marker */ |
60 | { 0, } | 60 | { 0, } |
61 | }; | 61 | }; |
@@ -76,7 +76,7 @@ static int sis_short_ata40(struct pci_dev *dev) | |||
76 | } | 76 | } |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * sis_old_port_base - return PCI configuration base for dev | 79 | * sis_old_port_base - return PCI configuration base for dev |
80 | * @adev: device | 80 | * @adev: device |
81 | * | 81 | * |
82 | * Returns the base of the PCI configuration registers for this port | 82 | * Returns the base of the PCI configuration registers for this port |
@@ -85,11 +85,11 @@ static int sis_short_ata40(struct pci_dev *dev) | |||
85 | 85 | ||
86 | static int sis_old_port_base(struct ata_device *adev) | 86 | static int sis_old_port_base(struct ata_device *adev) |
87 | { | 87 | { |
88 | return 0x40 + (4 * adev->link->ap->port_no) + (2 * adev->devno); | 88 | return 0x40 + (4 * adev->link->ap->port_no) + (2 * adev->devno); |
89 | } | 89 | } |
90 | 90 | ||
91 | /** | 91 | /** |
92 | * sis_port_base - return PCI configuration base for dev | 92 | * sis_port_base - return PCI configuration base for dev |
93 | * @adev: device | 93 | * @adev: device |
94 | * | 94 | * |
95 | * Returns the base of the PCI configuration registers for this port | 95 | * Returns the base of the PCI configuration registers for this port |
@@ -112,7 +112,7 @@ static int sis_port_base(struct ata_device *adev) | |||
112 | } | 112 | } |
113 | 113 | ||
114 | /** | 114 | /** |
115 | * sis_133_cable_detect - check for 40/80 pin | 115 | * sis_133_cable_detect - check for 40/80 pin |
116 | * @ap: Port | 116 | * @ap: Port |
117 | * @deadline: deadline jiffies for the operation | 117 | * @deadline: deadline jiffies for the operation |
118 | * | 118 | * |
@@ -133,7 +133,7 @@ static int sis_133_cable_detect(struct ata_port *ap) | |||
133 | } | 133 | } |
134 | 134 | ||
135 | /** | 135 | /** |
136 | * sis_66_cable_detect - check for 40/80 pin | 136 | * sis_66_cable_detect - check for 40/80 pin |
137 | * @ap: Port | 137 | * @ap: Port |
138 | * | 138 | * |
139 | * Perform cable detection on the UDMA66, UDMA100 and early UDMA133 | 139 | * Perform cable detection on the UDMA66, UDMA100 and early UDMA133 |
@@ -155,7 +155,7 @@ static int sis_66_cable_detect(struct ata_port *ap) | |||
155 | 155 | ||
156 | 156 | ||
157 | /** | 157 | /** |
158 | * sis_pre_reset - probe begin | 158 | * sis_pre_reset - probe begin |
159 | * @link: ATA link | 159 | * @link: ATA link |
160 | * @deadline: deadline jiffies for the operation | 160 | * @deadline: deadline jiffies for the operation |
161 | * | 161 | * |
@@ -183,7 +183,7 @@ static int sis_pre_reset(struct ata_link *link, unsigned long deadline) | |||
183 | 183 | ||
184 | 184 | ||
185 | /** | 185 | /** |
186 | * sis_set_fifo - Set RWP fifo bits for this device | 186 | * sis_set_fifo - Set RWP fifo bits for this device |
187 | * @ap: Port | 187 | * @ap: Port |
188 | * @adev: Device | 188 | * @adev: Device |
189 | * | 189 | * |
@@ -226,7 +226,7 @@ static void sis_set_fifo(struct ata_port *ap, struct ata_device *adev) | |||
226 | 226 | ||
227 | static void sis_old_set_piomode (struct ata_port *ap, struct ata_device *adev) | 227 | static void sis_old_set_piomode (struct ata_port *ap, struct ata_device *adev) |
228 | { | 228 | { |
229 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 229 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
230 | int port = sis_old_port_base(adev); | 230 | int port = sis_old_port_base(adev); |
231 | u8 t1, t2; | 231 | u8 t1, t2; |
232 | int speed = adev->pio_mode - XFER_PIO_0; | 232 | int speed = adev->pio_mode - XFER_PIO_0; |
@@ -263,7 +263,7 @@ static void sis_old_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
263 | 263 | ||
264 | static void sis_100_set_piomode (struct ata_port *ap, struct ata_device *adev) | 264 | static void sis_100_set_piomode (struct ata_port *ap, struct ata_device *adev) |
265 | { | 265 | { |
266 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 266 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
267 | int port = sis_old_port_base(adev); | 267 | int port = sis_old_port_base(adev); |
268 | int speed = adev->pio_mode - XFER_PIO_0; | 268 | int speed = adev->pio_mode - XFER_PIO_0; |
269 | 269 | ||
@@ -288,7 +288,7 @@ static void sis_100_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
288 | 288 | ||
289 | static void sis_133_set_piomode (struct ata_port *ap, struct ata_device *adev) | 289 | static void sis_133_set_piomode (struct ata_port *ap, struct ata_device *adev) |
290 | { | 290 | { |
291 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 291 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
292 | int port; | 292 | int port; |
293 | u32 t1; | 293 | u32 t1; |
294 | int speed = adev->pio_mode - XFER_PIO_0; | 294 | int speed = adev->pio_mode - XFER_PIO_0; |
@@ -336,7 +336,7 @@ static void sis_133_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
336 | 336 | ||
337 | static void sis_old_set_dmamode (struct ata_port *ap, struct ata_device *adev) | 337 | static void sis_old_set_dmamode (struct ata_port *ap, struct ata_device *adev) |
338 | { | 338 | { |
339 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 339 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
340 | int speed = adev->dma_mode - XFER_MW_DMA_0; | 340 | int speed = adev->dma_mode - XFER_MW_DMA_0; |
341 | int drive_pci = sis_old_port_base(adev); | 341 | int drive_pci = sis_old_port_base(adev); |
342 | u16 timing; | 342 | u16 timing; |
@@ -375,7 +375,7 @@ static void sis_old_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
375 | 375 | ||
376 | static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev) | 376 | static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev) |
377 | { | 377 | { |
378 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 378 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
379 | int speed = adev->dma_mode - XFER_MW_DMA_0; | 379 | int speed = adev->dma_mode - XFER_MW_DMA_0; |
380 | int drive_pci = sis_old_port_base(adev); | 380 | int drive_pci = sis_old_port_base(adev); |
381 | u16 timing; | 381 | u16 timing; |
@@ -414,7 +414,7 @@ static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
414 | 414 | ||
415 | static void sis_100_set_dmamode (struct ata_port *ap, struct ata_device *adev) | 415 | static void sis_100_set_dmamode (struct ata_port *ap, struct ata_device *adev) |
416 | { | 416 | { |
417 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 417 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
418 | int speed = adev->dma_mode - XFER_MW_DMA_0; | 418 | int speed = adev->dma_mode - XFER_MW_DMA_0; |
419 | int drive_pci = sis_old_port_base(adev); | 419 | int drive_pci = sis_old_port_base(adev); |
420 | u8 timing; | 420 | u8 timing; |
@@ -448,7 +448,7 @@ static void sis_100_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
448 | 448 | ||
449 | static void sis_133_early_set_dmamode (struct ata_port *ap, struct ata_device *adev) | 449 | static void sis_133_early_set_dmamode (struct ata_port *ap, struct ata_device *adev) |
450 | { | 450 | { |
451 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 451 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
452 | int speed = adev->dma_mode - XFER_MW_DMA_0; | 452 | int speed = adev->dma_mode - XFER_MW_DMA_0; |
453 | int drive_pci = sis_old_port_base(adev); | 453 | int drive_pci = sis_old_port_base(adev); |
454 | u8 timing; | 454 | u8 timing; |
@@ -481,7 +481,7 @@ static void sis_133_early_set_dmamode (struct ata_port *ap, struct ata_device *a | |||
481 | 481 | ||
482 | static void sis_133_set_dmamode (struct ata_port *ap, struct ata_device *adev) | 482 | static void sis_133_set_dmamode (struct ata_port *ap, struct ata_device *adev) |
483 | { | 483 | { |
484 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 484 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
485 | int port; | 485 | int port; |
486 | u32 t1; | 486 | u32 t1; |
487 | 487 | ||
@@ -710,7 +710,7 @@ static void sis_fixup(struct pci_dev *pdev, struct sis_chipset *sis) | |||
710 | * @pdev: PCI device to register | 710 | * @pdev: PCI device to register |
711 | * @ent: Entry in sis_pci_tbl matching with @pdev | 711 | * @ent: Entry in sis_pci_tbl matching with @pdev |
712 | * | 712 | * |
713 | * Called from kernel PCI layer. We probe for combined mode (sigh), | 713 | * Called from kernel PCI layer. We probe for combined mode (sigh), |
714 | * and then hand over control to libata, for it to do the rest. | 714 | * and then hand over control to libata, for it to do the rest. |
715 | * | 715 | * |
716 | * LOCKING: | 716 | * LOCKING: |
@@ -820,10 +820,10 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
820 | } | 820 | } |
821 | break; | 821 | break; |
822 | case 0x0180: /* SIS 965/965L */ | 822 | case 0x0180: /* SIS 965/965L */ |
823 | chipset = &sis133; | 823 | chipset = &sis133; |
824 | break; | 824 | break; |
825 | case 0x1180: /* SIS 966/966L */ | 825 | case 0x1180: /* SIS 966/966L */ |
826 | chipset = &sis133; | 826 | chipset = &sis133; |
827 | break; | 827 | break; |
828 | } | 828 | } |
829 | } | 829 | } |