aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/legacy/ht6560b.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-16 14:33:42 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-16 14:33:42 -0400
commite6d95bd14928926d6658b5e4ace905e8b83ed27a (patch)
treebc6c6b238505ff94e7523e1a9c2a445d9ddf7e6b /drivers/ide/legacy/ht6560b.c
parenta698400a1556cf9f0376d1a41e536973dd5c4747 (diff)
ide: ->port_init_devs -> ->init_dev
Change ->port_init_devs method to take 'ide_drive_t *' as an argument instead of 'ide_hwif_t *' and rename it to ->init_dev. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/legacy/ht6560b.c')
-rw-r--r--drivers/ide/legacy/ht6560b.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index bd2f579946fa..7bc8fd59ea9e 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -310,16 +310,16 @@ static void ht6560b_set_pio_mode(ide_drive_t *drive, const u8 pio)
310#endif 310#endif
311} 311}
312 312
313static void __init ht6560b_port_init_devs(ide_hwif_t *hwif) 313static void __init ht6560b_init_dev(ide_drive_t *drive)
314{ 314{
315 ide_hwif_t *hwif = drive->hwif;
315 /* Setting default configurations for drives. */ 316 /* Setting default configurations for drives. */
316 int t = (HT_CONFIG_DEFAULT << 8) | HT_TIMING_DEFAULT; 317 int t = (HT_CONFIG_DEFAULT << 8) | HT_TIMING_DEFAULT;
317 318
318 if (hwif->channel) 319 if (hwif->channel)
319 t |= (HT_SECONDARY_IF << 8); 320 t |= (HT_SECONDARY_IF << 8);
320 321
321 hwif->drives[0].drive_data = t; 322 drive->drive_data = t;
322 hwif->drives[1].drive_data = t;
323} 323}
324 324
325static int probe_ht6560b; 325static int probe_ht6560b;
@@ -328,7 +328,7 @@ module_param_named(probe, probe_ht6560b, bool, 0);
328MODULE_PARM_DESC(probe, "probe for HT6560B chipset"); 328MODULE_PARM_DESC(probe, "probe for HT6560B chipset");
329 329
330static const struct ide_port_ops ht6560b_port_ops = { 330static const struct ide_port_ops ht6560b_port_ops = {
331 .port_init_devs = ht6560b_port_init_devs, 331 .init_dev = ht6560b_init_dev,
332 .set_pio_mode = ht6560b_set_pio_mode, 332 .set_pio_mode = ht6560b_set_pio_mode,
333 .selectproc = ht6560b_selectproc, 333 .selectproc = ht6560b_selectproc,
334}; 334};