drivers/ide/ide-core: Convert printk's to pr_<foo> and dev_<foo>

index 77f79d2..87da341 100644
@@ -67,7 +67,7 @@ static bool ide_noacpi_psx;
 static int no_acpi_psx(const struct dmi_system_id *id)
 {
 	ide_noacpi_psx = true;
-	printk(KERN_NOTICE"%s detected - disable ACPI _PSx.\n", id->ident);
+	pr_notice("%s detected - disable ACPI _PSx.\n", id->ident);
 	return 0;
 }
 

@@ -262,8 +262,7 @@ static int do_drive_get_GTF(ide_drive_t *drive,
 
 	if (!out_obj->buffer.length || !out_obj->buffer.pointer ||
 	    out_obj->buffer.length % REGS_PER_GTF) {
-		printk(KERN_ERR
-		       "%s: unexpected GTF length (%d) or addr (0x%p)\n",
+		pr_err("%s: unexpected GTF length (%d) or addr (0x%p)\n",
 		       __func__, out_obj->buffer.length,
 		       out_obj->buffer.pointer);
 		err = -ENOENT;

@@ -324,8 +323,8 @@ static int do_drive_set_taskfiles(ide_drive_t *drive,
 
 		err = ide_no_data_taskfile(drive, &cmd);
 		if (err) {
-			printk(KERN_ERR "%s: ide_no_data_taskfile failed: %u\n",
-					__func__, err);
+			pr_err("%s: ide_no_data_taskfile failed: %u\n",
+			       __func__, err);
 			rc = err;
 		}
 	}

@@ -436,11 +435,9 @@ void ide_acpi_get_timing(ide_hwif_t *hwif)
 	if (!out_obj->buffer.length || !out_obj->buffer.pointer ||
 	    out_obj->buffer.length != sizeof(struct GTM_buffer)) {
 		kfree(output.pointer);
-		printk(KERN_ERR
-			"%s: unexpected _GTM length (0x%x)[should be 0x%zx] or "
-			"addr (0x%p)\n",
-			__func__, out_obj->buffer.length,
-			sizeof(struct GTM_buffer), out_obj->buffer.pointer);
+		pr_err("%s: unexpected _GTM length (0x%x)[should be 0x%zx] or addr (0x%p)\n",
+		       __func__, out_obj->buffer.length,
+		       sizeof(struct GTM_buffer), out_obj->buffer.pointer);
 		return;
 	}
 

139 lines not on this page · raw message

index e4cdf78..b3d9fb6 100644
@@ -162,8 +162,8 @@ int ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
 	}
 
 use_pio_instead:
-	printk(KERN_ERR "%s: %s\n", drive->name,
-		count ? "DMA table too small" : "empty DMA table?");
+	pr_err("%s: %s\n", drive->name,
+	       count ? "DMA table too small" : "empty DMA table?");
 
 	return 0; /* revert to PIO for this request */
 }

@@ -238,8 +238,8 @@ int ide_dma_sff_timer_expiry(ide_drive_t *drive)
 	ide_hwif_t *hwif = drive->hwif;
 	u8 dma_stat = hwif->dma_ops->dma_sff_read_status(hwif);
 
-	printk(KERN_WARNING "%s: %s: DMA status (0x%02x)\n",
-		drive->name, __func__, dma_stat);
+	pr_warning("%s: %s: DMA status (0x%02x)\n",
+		   drive->name, __func__, dma_stat);
 
 	if ((dma_stat & 0x18) == 0x18)	/* BUSY Stupid Early Timer !! */
 		return WAIT_CMD;

index a0b8cab..bd33ed4 100644
@@ -106,8 +106,8 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive)
 						cmd->rq->nr_sectors << 9);
 			return ide_stopped;
 		}
-		printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",
-			drive->name, __func__, dma_stat);
+		pr_err("%s: %s: bad DMA status (0x%02x)\n",
+		       drive->name, __func__, dma_stat);
 	}
 	return ide_error(drive, "dma_intr", stat);
 }

@@ -194,7 +194,7 @@ EXPORT_SYMBOL(ide_dma_off_quietly);
 
 void ide_dma_off(ide_drive_t *drive)
 {
-	printk(KERN_INFO "%s: DMA disabled\n", drive->name);
+	pr_info("%s: DMA disabled\n", drive->name);
 	ide_dma_off_quietly(drive);
 }
 EXPORT_SYMBOL(ide_dma_off);

@@ -220,8 +220,8 @@ int __ide_dma_bad_drive(ide_drive_t *drive)
 
 	int blacklist = ide_in_drive_list(id, drive_blacklist);
 	if (blacklist) {
-		printk(KERN_WARNING "%s: Disabling (U)DMA for %s (blacklisted)\n",
-				    drive->name, (char *)&id[ATA_ID_PROD]);
+		pr_warning("%s: Disabling (U)DMA for %s (blacklisted)\n",
+			   drive->name, (char *)&id[ATA_ID_PROD]);
 		return blacklist;
 	}
 	return 0;

@@ -342,8 +342,8 @@ u8 ide_find_dma_mode(ide_drive_t *drive, u8 req_mode)
 
 	mode = min(mode, req_mode);
 
-	printk(KERN_INFO "%s: %s mode selected\n", drive->name,
-			  mode ? ide_xfer_verbose(mode) : "no DMA");
+	pr_info("%s: %s mode selected\n", drive->name,
+		mode ? ide_xfer_verbose(mode) : "no DMA");
 
 	return mode;
 }

@@ -409,7 +409,7 @@ int ide_id_dma_bug(ide_drive_t *drive)
 
 	return 0;
 err_out:
-	printk(KERN_ERR "%s: bad DMA info in identify block\n", drive->name);
+	pr_err("%s: bad DMA info in identify block\n", drive->name);
 	return 1;
 }
 

@@ -456,7 +456,7 @@ void ide_check_dma_crc(ide_drive_t *drive)
 
 void ide_dma_lost_irq(ide_drive_t *drive)
 {
-	printk(KERN_ERR "%s: DMA interrupt recovery\n", drive->name);
+	pr_err("%s: DMA interrupt recovery\n", drive->name);
 }
 EXPORT_SYMBOL_GPL(ide_dma_lost_irq);
 

@@ -478,17 +478,17 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
 	 */
 
 	if (error < 0) {
-		printk(KERN_WARNING "%s: DMA timeout error\n", drive->name);
+		pr_warning("%s: DMA timeout error\n", drive->name);
 		drive->waiting_for_dma = 0;
 		(void)dma_ops->dma_end(drive);
 		ide_dma_unmap_sg(drive, cmd);
 		ret = ide_error(drive, "dma timeout error",
 				hwif->tp_ops->read_status(hwif));
 	} else {
-		printk(KERN_WARNING "%s: DMA timeout retry\n", drive->name);
+		pr_warning("%s: DMA timeout retry\n", drive->name);
 		if (dma_ops->dma_clear)
 			dma_ops->dma_clear(drive);
-		printk(KERN_ERR "%s: timeout waiting for DMA\n", drive->name);
+		pr_err("%s: timeout waiting for DMA\n", drive->name);
 		if (dma_ops->dma_test_irq(drive) == 0) {
 			ide_dump_status(drive, "DMA timeout",
 					hwif->tp_ops->read_status(hwif));

@@ -557,8 +557,7 @@ int ide_allocate_dma_engine(ide_hwif_t *hwif)
 						&hwif->dmatable_dma,
 						GFP_ATOMIC);
 	if (hwif->dmatable_cpu == NULL) {
-		printk(KERN_ERR "%s: unable to allocate PRD table\n",
-			hwif->name);
+		pr_err("%s: unable to allocate PRD table\n", hwif->name);
 		return -ENOMEM;
 	}
 

index 5d5fb96..a7f0142 100644
@@ -173,7 +173,7 @@ static ide_startstop_t atapi_reset_pollfunc(ide_drive_t *drive)
 	stat = tp_ops->read_status(hwif);
 
 	if (OK_STAT(stat, 0, ATA_BUSY))
-		printk(KERN_INFO "%s: ATAPI reset complete\n", drive->name);
+		pr_info("%s: ATAPI reset complete\n", drive->name);
 	else {
 		if (time_before(jiffies, hwif->poll_timeout)) {
 			ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20);

@@ -182,8 +182,8 @@ static ide_startstop_t atapi_reset_pollfunc(ide_drive_t *drive)
 		}
 		/* end of polling */
 		hwif->polling = 0;
-		printk(KERN_ERR "%s: ATAPI reset timed-out, status=0x%02x\n",
-			drive->name, stat);
+		pr_err("%s: ATAPI reset timed-out, status=0x%02x\n",
+		       drive->name, stat);
 		/* do it the old fashioned way */
 		return do_reset1(drive, 1);
 	}

@@ -202,14 +202,14 @@ static void ide_reset_report_error(ide_hwif_t *hwif, u8 err)
 
 	u8 err_master = err & 0x7f;
 
-	printk(KERN_ERR "%s: reset: master: ", hwif->name);
+	pr_err("%s: reset: master: ", hwif->name);
 	if (err_master && err_master < 6)
-		printk(KERN_CONT "%s", err_master_vals[err_master]);
+		pr_cont("%s", err_master_vals[err_master]);
 	else
-		printk(KERN_CONT "error (0x%02x?)", err);
+		pr_cont("error (0x%02x?)", err);
 	if (err & 0x80)
-		printk(KERN_CONT "; slave: failed");
-	printk(KERN_CONT "\n");
+		pr_cont("; slave: failed");
+	pr_cont("\n");
 }
 
 /*

@@ -228,8 +228,8 @@ static ide_startstop_t reset_pollfunc(ide_drive_t *drive)
 	if (port_ops && port_ops->reset_poll) {
 		err = port_ops->reset_poll(drive);
 		if (err) {
-			printk(KERN_ERR "%s: host reset_poll failure for %s.\n",
-				hwif->name, drive->name);
+			pr_err("%s: host reset_poll failure for %s.\n",
+			       hwif->name, drive->name);
 			goto out;
 		}
 	}

@@ -242,15 +242,15 @@ static ide_startstop_t reset_pollfunc(ide_drive_t *drive)
 			/* continue polling */
 			return ide_started;
 		}
-		printk(KERN_ERR "%s: reset timed-out, status=0x%02x\n",
-			hwif->name, tmp);
+		pr_err("%s: reset timed-out, status=0x%02x\n",
+		       hwif->name, tmp);
 		drive->failures++;
 		err = -EIO;
 	} else  {
 		tmp = ide_read_error(drive);
 
 		if (tmp == 1) {
-			printk(KERN_INFO "%s: reset: success\n", hwif->name);
+			pr_info("%s: reset: success\n", hwif->name);
 			drive->failures = 0;
 		} else {
 			ide_reset_report_error(hwif, tmp);

index 35dc38d..75812db 100644
@@ -95,8 +95,7 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
 	if ((cmd->tf_flags & IDE_TFLAG_CUSTOM_HANDLER) &&
 	    tf_cmd == ATA_CMD_IDLEIMMEDIATE) {
 		if (tf->lbal != 0xc4) {
-			printk(KERN_ERR "%s: head unload failed!\n",
-			       drive->name);
+			pr_err("%s: head unload failed!\n", drive->name);
 			ide_tf_dump(drive->name, cmd);
 		} else
 			drive->dev_flags |= IDE_DFLAG_PARKED;

@@ -204,7 +203,7 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive)
 	} else if (s->all) {
 		int special = s->all;
 		s->all = 0;
-		printk(KERN_ERR "%s: bad special flag: 0x%02x\n", drive->name, special);
+		pr_err("%s: bad special flag: 0x%02x\n", drive->name, special);
 		return ide_stopped;
 	}
 

@@ -355,7 +354,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
 	drive->hwif->tp_ops->dev_select(drive);
 	if (ide_wait_stat(&startstop, drive, drive->ready_stat,
 			  ATA_BUSY | ATA_DRQ, WAIT_READY)) {
-		printk(KERN_ERR "%s: drive not ready for command\n", drive->name);
+		pr_err("%s: drive not ready for command\n", drive->name);
 		return startstop;
 	}
 	if (!drive->special.all) {

@@ -684,8 +683,7 @@ void ide_timer_expiry (unsigned long data)
 				hwif->dma_ops->dma_lost_irq(drive);
 			if (hwif->ack_intr)
 				hwif->ack_intr(hwif);
-			printk(KERN_WARNING "%s: lost interrupt\n",
-				drive->name);
+			pr_warning("%s: lost interrupt\n", drive->name);
 			startstop = handler(drive);
 		} else {
 			if (drive->waiting_for_dma)

@@ -749,9 +747,8 @@ static void unexpected_intr(int irq, ide_hwif_t *hwif)
 
 		if (time_after(jiffies, last_msgtime + HZ)) {
 			last_msgtime = jiffies;
-			printk(KERN_ERR "%s: unexpected interrupt, "
-				"status=0x%02x, count=%ld\n",
-				hwif->name, stat, count);
+			pr_err("%s: unexpected interrupt, status=0x%02x, count=%ld\n",
+			       hwif->name, stat, count);
 		}
 	}
 }

index c1c25eb..aea6cc3 100644
@@ -167,8 +167,8 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg)
 	     id[ATA_ID_SWDMA_MODES])) {
 		xfer_rate = args[1];
 		if (tf->nsect > XFER_UDMA_2 && !eighty_ninty_three(drive)) {
-			printk(KERN_WARNING "%s: UDMA speeds >UDMA33 cannot "
-					    "be set\n", drive->name);
+			pr_warning("%s: UDMA speeds >UDMA33 cannot be set\n",
+				   drive->name);
 			goto abort;
 		}
 	}

index c19a221..8fe778c 100644
@@ -259,10 +259,10 @@ no_80w:
 	if (drive->dev_flags & IDE_DFLAG_UDMA33_WARNED)
 		return 0;
 
-	printk(KERN_WARNING "%s: %s side 80-wire cable detection failed, "
-			    "limiting max speed to UDMA33\n",
-			    drive->name,
-			    hwif->cbl == ATA_CBL_PATA80 ? "drive" : "host");
+	pr_warning("%s: %s side 80-wire cable detection failed, "
+		   "limiting max speed to UDMA33\n",
+		   drive->name,
+		   hwif->cbl == ATA_CBL_PATA80 ? "drive" : "host");
 
 	drive->dev_flags |= IDE_DFLAG_UDMA33_WARNED;
 

@@ -300,7 +300,7 @@ int ide_driveid_update(ide_drive_t *drive)
 out_err:
 	SELECT_MASK(drive, 0);
 	if (rc == 2)
-		printk(KERN_ERR "%s: %s: bad status\n", drive->name, __func__);
+		pr_err("%s: %s: bad status\n", drive->name, __func__);
 	kfree(id);
 	return 0;
 }

index 8c5dcbf..bb42707 100644
@@ -19,14 +19,14 @@ static void ide_legacy_init_one(hw_regs_t **hws, hw_regs_t *hw,
 	}
 
 	if (!request_region(base, 8, d->name)) {
-		printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",
-				d->name, base, base + 7);
+		pr_err("%s: I/O resource 0x%lX-0x%lX not free.\n",
+		       d->name, base, base + 7);
 		return;
 	}
 
 	if (!request_region(ctl, 1, d->name)) {
-		printk(KERN_ERR "%s: I/O resource 0x%lX not free.\n",
-				d->name, ctl);
+		pr_err("%s: I/O resource 0x%lX not free.\n",
+		       d->name, ctl);
 		release_region(base, 8);
 		return;
 	}

131 lines not on this page · raw message

index 0d8a151..7402bb5 100644
@@ -80,7 +80,7 @@ void ide_complete_power_step(ide_drive_t *drive, struct request *rq)
 	struct request_pm_state *pm = rq->data;
 
 #ifdef DEBUG_PM
-	printk(KERN_INFO "%s: complete_power_step(step: %d)\n",
+	pr_info("%s: complete_power_step(step: %d)\n",
 		drive->name, pm->pm_step);
 #endif
 	if (drive->media != ide_disk)

@@ -233,12 +233,12 @@ void ide_check_pm_state(ide_drive_t *drive, struct request *rq)
 #endif
 		rc = ide_wait_not_busy(hwif, 35000);
 		if (rc)
-			printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name);
+			pr_warning("%s: bus not ready on wakeup\n", drive->name);
 		tp_ops->dev_select(drive);
 		tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
 		rc = ide_wait_not_busy(hwif, 100000);
 		if (rc)
-			printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);
+			pr_warning("%s: drive not ready on wakeup\n", drive->name);
 
 		spin_lock_irqsave(q->queue_lock, flags);
 		blk_start_queue(q);

252 lines not on this page · raw message

index 3242698..0fa097e 100644
@@ -241,8 +241,7 @@ static void proc_ide_settings_warn(void)
 	if (warned)
 		return;
 
-	printk(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is "
-			    "obsolete, and will be removed soon!\n");
+	pr_warning("Warning: /proc/ide/hd?/settings interface is obsolete, and will be removed soon!\n");
 	warned = 1;
 }
 

@@ -464,15 +463,13 @@ static int ide_replace_subdriver(ide_drive_t *drive, const char *driver)
 	strlcpy(drive->driver_req, driver, sizeof(drive->driver_req));
 	err = device_attach(dev);
 	if (err < 0)
-		printk(KERN_WARNING "IDE: %s: device_attach error: %d\n",
-			__func__, err);
+		pr_warning("IDE: %s: device_attach error: %d\n", __func__, err);
 	drive->driver_req[0] = 0;
 	if (dev->driver == NULL) {
 		err = device_attach(dev);
 		if (err < 0)
-			printk(KERN_WARNING
-				"IDE: %s: device_attach(2) error: %d\n",
-				__func__, err);
+			pr_warning("IDE: %s: device_attach(2) error: %d\n",
+				   __func__, err);
 	}
 	if (dev->driver && !strcmp(dev->driver->name, driver))
 		ret = 0;

@@ -666,8 +663,8 @@ static int ide_drivers_show(struct seq_file *s, void *p)
 
 	err = bus_for_each_drv(&ide_bus_type, NULL, s, proc_print_driver);
 	if (err < 0)
-		printk(KERN_WARNING "IDE: %s: bus_for_each_drv error: %d\n",
-			__func__, err);
+		pr_warning("IDE: %s: bus_for_each_drv error: %d\n",
+			   __func__, err);
 	return 0;
 }
 

index 0e79eff..84e791a 100644
@@ -101,8 +101,8 @@ static int __init ide_scan_pcibus(void)
 		d = list_entry(l, struct pci_driver, node);
 		if (__pci_register_driver(d, d->driver.owner,
 					  d->driver.mod_name))
-			printk(KERN_ERR "%s: failed to register %s driver\n",
-					__func__, d->driver.mod_name);
+			pr_err("%s: failed to register %s driver\n",
+			       __func__, d->driver.mod_name);
 	}
 
 	return 0;

index 4aa6223..baf0956 100644
@@ -86,7 +86,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
 	if (orig_cmd->protocol == ATA_PROT_PIO &&
 	    (orig_cmd->tf_flags & IDE_TFLAG_MULTI_PIO) &&
 	    drive->mult_count == 0) {
-		printk(KERN_ERR "%s: multimode not set!\n", drive->name);
+		pr_err("%s: multimode not set!\n", drive->name);
 		return ide_stopped;
 	}
 

@@ -215,7 +215,7 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
 	}
 
 	if (stat & ATA_BUSY)
-		printk(KERN_ERR "%s: drive still BUSY!\n", drive->name);
+		pr_err("%s: drive still BUSY!\n", drive->name);
 
 	return stat;
 }

@@ -399,10 +399,10 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
 
 	if (ide_wait_stat(&startstop, drive, ATA_DRQ,
 			  drive->bad_wstat, WAIT_DRQ)) {
-		printk(KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n",
-			drive->name,
-			(cmd->tf_flags & IDE_TFLAG_MULTI_PIO) ? "MULT" : "",
-			(drive->dev_flags & IDE_DFLAG_LBA48) ? "_EXT" : "");
+		pr_err("%s: no DRQ after issuing %sWRITE%s\n",
+		       drive->name,
+		       (cmd->tf_flags & IDE_TFLAG_MULTI_PIO) ? "MULT" : "",
+		       (drive->dev_flags & IDE_DFLAG_LBA48) ? "_EXT" : "");
 		return startstop;
 	}
 

@@ -576,9 +576,8 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
 		case TASKFILE_MULTI_OUT:
 			if (!drive->mult_count) {
 				/* (hs): give up if multcount is not set */
-				printk(KERN_ERR "%s: %s Multimode Write " \
-					"multcount is not set\n",
-					drive->name, __func__);
+				pr_err("%s: %s Multimode Write multcount is not set\n",
+				       drive->name, __func__);
 				err = -EPERM;
 				goto abort;
 			}

@@ -596,9 +595,8 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
 		case TASKFILE_MULTI_IN:
 			if (!drive->mult_count) {
 				/* (hs): give up if multcount is not set */
-				printk(KERN_ERR "%s: %s Multimode Read failure " \
-					"multcount is not set\n",
-					drive->name, __func__);
+				pr_err("%s: %s Multimode Read failure multcount is not set\n",
+				       drive->name, __func__);
 				err = -EPERM;
 				goto abort;
 			}

@@ -626,8 +624,8 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
 		nsect = (cmd.hob.nsect << 8) | cmd.tf.nsect;
 
 		if (!nsect) {
-			printk(KERN_ERR "%s: in/out command without data\n",
-					drive->name);
+			pr_err("%s: in/out command without data\n",
+			       drive->name);
 			err = -EFAULT;
 			goto abort;
 		}

index af44be9..03d8e14 100644
@@ -70,7 +70,7 @@ u8 ide_get_best_pio_mode(ide_drive_t *drive, u8 mode_wanted, u8 max_mode)
 		pio_mode = ide_scan_pio_blacklist((char *)&id[ATA_ID_PROD]);
 
 	if (pio_mode != -1) {
-		printk(KERN_INFO "%s: is on PIO blacklist\n", drive->name);
+		pr_info("%s: is on PIO blacklist\n", drive->name);
 	} else {
 		pio_mode = id[ATA_ID_OLD_PIO_MODES] >> 8;
 		if (pio_mode > 2) {	/* 2 is maximum allowed tPIO value */

@@ -96,8 +96,8 @@ u8 ide_get_best_pio_mode(ide_drive_t *drive, u8 mode_wanted, u8 max_mode)
 		}
 
 		if (overridden)
-			printk(KERN_INFO "%s: tPIO > 2, assuming tPIO = 2\n",
-					 drive->name);
+			pr_info("%s: tPIO > 2, assuming tPIO = 2\n",
+				drive->name);
 	}
 
 	if (pio_mode > max_mode)

index 92c9b90..966c2da 100644
@@ -273,25 +273,23 @@ static void ide_dev_apply_params(ide_drive_t *drive, u8 unit)
 	int i = drive->hwif->index * MAX_DRIVES + unit;
 
 	if (ide_nodma & (1 << i)) {
-		printk(KERN_INFO "ide: disallowing DMA for %s\n", drive->name);
+		pr_info("ide: disallowing DMA for %s\n", drive->name);
 		drive->dev_flags |= IDE_DFLAG_NODMA;
 	}
 	if (ide_noflush & (1 << i)) {
-		printk(KERN_INFO "ide: disabling flush requests for %s\n",
-				 drive->name);
+		pr_info("ide: disabling flush requests for %s\n", drive->name);
 		drive->dev_flags |= IDE_DFLAG_NOFLUSH;
 	}
 	if (ide_noprobe & (1 << i)) {
-		printk(KERN_INFO "ide: skipping probe for %s\n", drive->name);
+		pr_info("ide: skipping probe for %s\n", drive->name);
 		drive->dev_flags |= IDE_DFLAG_NOPROBE;
 	}
 	if (ide_nowerr & (1 << i)) {
-		printk(KERN_INFO "ide: ignoring the ATA_DF bit for %s\n",
-				 drive->name);
+		pr_info("ide: ignoring the ATA_DF bit for %s\n", drive->name);
 		drive->bad_wstat = BAD_R_STAT;
 	}
 	if (ide_cdroms & (1 << i)) {
-		printk(KERN_INFO "ide: forcing %s as a CD-ROM\n", drive->name);
+		pr_info("ide: forcing %s as a CD-ROM\n", drive->name);
 		drive->dev_flags |= IDE_DFLAG_PRESENT;
 		drive->media = ide_cdrom;
 		/* an ATAPI device ignores DRDY */

@@ -302,9 +300,8 @@ static void ide_dev_apply_params(ide_drive_t *drive, u8 unit)
 		drive->head = drive->bios_head = ide_disks_chs[i].head;
 		drive->sect = drive->bios_sect = ide_disks_chs[i].sect;
 
-		printk(KERN_INFO "ide: forcing %s as a disk (%d/%d/%d)\n",
-				 drive->name,
-				 drive->cyl, drive->head, drive->sect);
+		pr_info("ide: forcing %s as a disk (%d/%d/%d)\n",
+			drive->name, drive->cyl, drive->head, drive->sect);
 
 		drive->dev_flags |= IDE_DFLAG_FORCED_GEOM | IDE_DFLAG_PRESENT;
 		drive->media = ide_disk;

@@ -343,8 +340,7 @@ void ide_port_apply_params(ide_hwif_t *hwif)
 	int i;
 
 	if (ide_ignore_cable & (1 << hwif->index)) {
-		printk(KERN_INFO "ide: ignoring cable detection for %s\n",
-				 hwif->name);
+		pr_info("ide: ignoring cable detection for %s\n", hwif->name);
 		hwif->cbl = ATA_CBL_PATA40_SHORT;
 	}
 

@@ -359,11 +355,11 @@ static int __init ide_init(void)
 {
 	int ret;
 
-	printk(KERN_INFO "Uniform Multi-Platform E-IDE driver\n");
+	pr_info("Uniform Multi-Platform E-IDE driver\n");
 
 	ret = bus_register(&ide_bus_type);
 	if (ret < 0) {
-		printk(KERN_WARNING "IDE: bus_register error: %d\n", ret);
+		pr_warning("IDE: bus_register error: %d\n", ret);
 		return ret;
 	}
 

206 lines not on this page · raw message

index 9a6ec77..591ccd9 100644
@@ -50,21 +50,21 @@ int ide_check_atapi_device(ide_drive_t *drive, const char *s)
 #endif
 
 	if (protocol != 2)
-		pr_err("%s: %s: protocol (0x%02x) is not ATAPI\n",
-		       s, drive->name, protocol);
+		dev_err(&drive->gendev, "%s: protocol (0x%02x) is not ATAPI\n",
+			s, protocol);
 	else if ((drive->media == ide_floppy && device_type != 0) ||
 		 (drive->media == ide_tape && device_type != 1))
-		pr_err("%s: %s: invalid device type (0x%02x)\n",
-		       s, drive->name, device_type);
+		dev_err(&drive->gendev, "%s: invalid device type (0x%02x)\n",
+		       s, device_type);
 	else if (removable == 0)
-		pr_err("%s: %s: the removable flag is not set\n",
-		       s, drive->name);
+		dev_err(&drive->gendev, "%s: the removable flag is not set\n",
+			s);
 	else if (drive->media == ide_floppy && drq_type == 3)
-		pr_err("%s: %s: sorry, DRQ type (0x%02x) not supported\n",
-		       s, drive->name, drq_type);
+		dev_err(&drive->gendev, "%s: sorry, DRQ type (0x%02x) not supported\n",
+			s, drq_type);
 	else if (packet_size != 0)
-		pr_err("%s: %s: packet size (0x%02x) is not 12 bytes\n",
-		       s, drive->name, packet_size);
+		dev_err(&drive->gendev, "%s: packet size (0x%02x) is not 12 bytes\n",
+			s, packet_size);
 	else
 		return 1;
 	return 0;

@@ -231,7 +231,8 @@ int ide_cd_expiry(ide_drive_t *drive)
 		break;
 	default:
 		if (!(rq->cmd_flags & REQ_QUIET))
-			pr_info("cmd 0x%x timed out\n", rq->cmd[0]);
+			dev_info(&drive->gendev, "cmd 0x%x timed out\n",
+				 rq->cmd[0]);
 		wait = 0;
 		break;
 	}

@@ -298,9 +299,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 
 		if (rc || (drive->media == ide_tape && (stat & ATA_ERR))) {
 			if (drive->media == ide_floppy)
-				pr_err("%s: DMA %s error\n",
-				       drive->name,
-				       rq_data_dir(pc->rq) ? "write" : "read");
+				dev_err(&drive->gendev, "DMA %s error\n",
+					rq_data_dir(pc->rq) ? "write" : "read");
 			pc->flags |= PC_FLAG_DMA_ERROR;
 		} else {
 			pc->xferred = pc->req_xfer;

@@ -334,8 +334,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 				pc->rq->errors++;
 
 			if (rq->cmd[0] == REQUEST_SENSE) {
-				pr_err("%s: I/O error in request sense command\n",
-				       drive->name);
+				dev_err(&drive->gendev,
+					"I/O error in request sense command\n");
 				return ide_do_reset(drive);
 			}
 

@@ -383,8 +383,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 
 	if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
 		pc->flags &= ~PC_FLAG_DMA_IN_PROGRESS;
-		pr_err("%s: The device wants to issue more interrupts in DMA mode\n",
-		       drive->name);
+		dev_err(&drive->gendev,
+			"The device wants to issue more interrupts in DMA mode\n");
 		ide_dma_off(drive);
 		return ide_do_reset(drive);
 	}

@@ -393,16 +393,16 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 	ide_read_bcount_and_ireason(drive, &bcount, &ireason);
 
 	if (ireason & ATAPI_COD) {
-		pr_err("%s: CoD != 0 in %s\n", drive->name, __func__);
+		dev_err(&drive->gendev, "CoD != 0 in %s\n", __func__);
 		return ide_do_reset(drive);
 	}
 
 	if (((ireason & ATAPI_IO) == ATAPI_IO) == write) {
 		/* Hopefully, we will never get here */
-		pr_err("%s: We wanted to %s, but the device wants us to %s!\n",
-		       drive->name,
-		       (ireason & ATAPI_IO) ? "Write" : "Read",
-		       (ireason & ATAPI_IO) ? "Read" : "Write");
+		dev_err(&drive->gendev,
+			"We wanted to %s, but the device wants us to %s!\n",
+			(ireason & ATAPI_IO) ? "Write" : "Read",
+			(ireason & ATAPI_IO) ? "Read" : "Write");
 		return ide_do_reset(drive);
 	}
 

@@ -462,13 +462,13 @@ static u8 ide_wait_ireason(ide_drive_t *drive, u8 ireason)
 
 	while (retries-- && ((ireason & ATAPI_COD) == 0 ||
 		(ireason & ATAPI_IO))) {
-		pr_err("%s: (IO,CoD != (0,1) while issuing a packet command, retrying\n",
-		       drive->name);
+		dev_err(&drive->gendev,
+			"(IO,CoD != (0,1) while issuing a packet command, retrying\n");
 		udelay(100);
 		ireason = ide_read_ireason(drive);
 		if (retries == 0) {
-			pr_err("%s: (IO,CoD != (0,1) while issuing a packet command, ignoring\n",
-			       drive->name);
+			dev_err(&drive->gendev,
+				"(IO,CoD != (0,1) while issuing a packet command, ignoring\n");
 			ireason |= ATAPI_COD;
 			ireason &= ~ATAPI_IO;
 		}

@@ -498,8 +498,8 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
 	u8 ireason;
 
 	if (ide_wait_stat(&startstop, drive, ATA_DRQ, ATA_BUSY, WAIT_READY)) {
-		pr_err("%s: Strange, packet command initiated yet DRQ isn't asserted\n",
-		       drive->name);
+		dev_err(&drive->gendev,
+			"Strange, packet command initiated yet DRQ isn't asserted\n");
 		return startstop;
 	}
 

@@ -540,9 +540,8 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
 			ireason = ide_wait_ireason(drive, ireason);
 
 		if ((ireason & ATAPI_COD) == 0 || (ireason & ATAPI_IO)) {
-			pr_err("%s: (IO,CoD) != (0,1) while issuing a packet command\n",
-			       drive->name);
-
+			dev_err(&drive->gendev,
+				"(IO,CoD) != (0,1) while issuing a packet command\n");
 			return ide_do_reset(drive);
 		}
 	}

index b3d9fb6..9fcebf3 100644
@@ -162,8 +162,8 @@ int ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
 	}
 
 use_pio_instead:
-	pr_err("%s: %s\n", drive->name,
-	       count ? "DMA table too small" : "empty DMA table?");
+	dev_err(&drive->gendev, "%s\n",
+		count ? "DMA table too small" : "empty DMA table?");
 
 	return 0; /* revert to PIO for this request */
 }

@@ -238,8 +238,8 @@ int ide_dma_sff_timer_expiry(ide_drive_t *drive)
 	ide_hwif_t *hwif = drive->hwif;
 	u8 dma_stat = hwif->dma_ops->dma_sff_read_status(hwif);
 
-	pr_warning("%s: %s: DMA status (0x%02x)\n",
-		   drive->name, __func__, dma_stat);
+	dev_warn(&drive->gendev, "%s: DMA status (0x%02x)\n",
+		 __func__, dma_stat);
 
 	if ((dma_stat & 0x18) == 0x18)	/* BUSY Stupid Early Timer !! */
 		return WAIT_CMD;

index bd33ed4..f4c4a42 100644
@@ -106,8 +106,8 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive)
 						cmd->rq->nr_sectors << 9);
 			return ide_stopped;
 		}
-		pr_err("%s: %s: bad DMA status (0x%02x)\n",
-		       drive->name, __func__, dma_stat);
+		dev_err(&drive->gendev, "%s: bad DMA status (0x%02x)\n",
+			__func__, dma_stat);
 	}
 	return ide_error(drive, "dma_intr", stat);
 }

@@ -194,7 +194,7 @@ EXPORT_SYMBOL(ide_dma_off_quietly);
 
 void ide_dma_off(ide_drive_t *drive)
 {
-	pr_info("%s: DMA disabled\n", drive->name);
+	dev_info(&drive->gendev, "DMA disabled\n");
 	ide_dma_off_quietly(drive);
 }
 EXPORT_SYMBOL(ide_dma_off);

@@ -220,8 +220,9 @@ int __ide_dma_bad_drive(ide_drive_t *drive)
 
 	int blacklist = ide_in_drive_list(id, drive_blacklist);
 	if (blacklist) {
-		pr_warning("%s: Disabling (U)DMA for %s (blacklisted)\n",
-			   drive->name, (char *)&id[ATA_ID_PROD]);
+		dev_warn(&drive->gendev,
+			 "Disabling (U)DMA for %s (blacklisted)\n",
+			 (char *)&id[ATA_ID_PROD]);
 		return blacklist;
 	}
 	return 0;

@@ -342,8 +343,8 @@ u8 ide_find_dma_mode(ide_drive_t *drive, u8 req_mode)
 
 	mode = min(mode, req_mode);
 
-	pr_info("%s: %s mode selected\n", drive->name,
-		mode ? ide_xfer_verbose(mode) : "no DMA");
+	dev_info(&drive->gendev, "%s mode selected\n",
+		 mode ? ide_xfer_verbose(mode) : "no DMA");
 
 	return mode;
 }

@@ -409,7 +410,7 @@ int ide_id_dma_bug(ide_drive_t *drive)
 
 	return 0;
 err_out:
-	pr_err("%s: bad DMA info in identify block\n", drive->name);
+	dev_err(&drive->gendev, "bad DMA info in identify block\n");
 	return 1;
 }
 

@@ -456,7 +457,7 @@ void ide_check_dma_crc(ide_drive_t *drive)
 
 void ide_dma_lost_irq(ide_drive_t *drive)
 {
-	pr_err("%s: DMA interrupt recovery\n", drive->name);
+	dev_err(&drive->gendev, "DMA interrupt recovery\n");
 }
 EXPORT_SYMBOL_GPL(ide_dma_lost_irq);
 

@@ -478,17 +479,17 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
 	 */
 
 	if (error < 0) {
-		pr_warning("%s: DMA timeout error\n", drive->name);
+		dev_warn(&drive->gendev, "DMA timeout error\n");
 		drive->waiting_for_dma = 0;
 		(void)dma_ops->dma_end(drive);
 		ide_dma_unmap_sg(drive, cmd);
 		ret = ide_error(drive, "dma timeout error",
 				hwif->tp_ops->read_status(hwif));
 	} else {
-		pr_warning("%s: DMA timeout retry\n", drive->name);
+		dev_warn(&drive->gendev, "DMA timeout retry\n");
 		if (dma_ops->dma_clear)
 			dma_ops->dma_clear(drive);
-		pr_err("%s: timeout waiting for DMA\n", drive->name);
+		dev_err(&drive->gendev, "timeout waiting for DMA\n");
 		if (dma_ops->dma_test_irq(drive) == 0) {
 			ide_dump_status(drive, "DMA timeout",
 					hwif->tp_ops->read_status(hwif));

@@ -557,7 +558,7 @@ int ide_allocate_dma_engine(ide_hwif_t *hwif)
 						&hwif->dmatable_dma,
 						GFP_ATOMIC);
 	if (hwif->dmatable_cpu == NULL) {
-		pr_err("%s: unable to allocate PRD table\n", hwif->name);
+		dev_err(hwif->dev, "unable to allocate PRD table\n");
 		return -ENOMEM;
 	}
 

index a7f0142..af6d512 100644
@@ -173,7 +173,7 @@ static ide_startstop_t atapi_reset_pollfunc(ide_drive_t *drive)
 	stat = tp_ops->read_status(hwif);
 
 	if (OK_STAT(stat, 0, ATA_BUSY))
-		pr_info("%s: ATAPI reset complete\n", drive->name);
+		dev_info(&drive->gendev, "ATAPI reset complete\n");
 	else {
 		if (time_before(jiffies, hwif->poll_timeout)) {
 			ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20);

@@ -182,8 +182,8 @@ static ide_startstop_t atapi_reset_pollfunc(ide_drive_t *drive)
 		}
 		/* end of polling */
 		hwif->polling = 0;
-		pr_err("%s: ATAPI reset timed-out, status=0x%02x\n",
-		       drive->name, stat);
+		dev_err(&drive->gendev, "ATAPI reset timed-out, status=0x%02x\n",
+		        stat);
 		/* do it the old fashioned way */
 		return do_reset1(drive, 1);
 	}

@@ -202,7 +202,7 @@ static void ide_reset_report_error(ide_hwif_t *hwif, u8 err)
 
 	u8 err_master = err & 0x7f;
 
-	pr_err("%s: reset: master: ", hwif->name);
+	dev_err(hwif->dev, "reset: master: ");
 	if (err_master && err_master < 6)
 		pr_cont("%s", err_master_vals[err_master]);
 	else

@@ -228,8 +228,8 @@ static ide_startstop_t reset_pollfunc(ide_drive_t *drive)
 	if (port_ops && port_ops->reset_poll) {
 		err = port_ops->reset_poll(drive);
 		if (err) {
-			pr_err("%s: host reset_poll failure for %s.\n",
-			       hwif->name, drive->name);
+			dev_err(hwif->dev, "host reset_poll failure for %s.\n",
+				drive->name);
 			goto out;
 		}
 	}

@@ -242,15 +242,14 @@ static ide_startstop_t reset_pollfunc(ide_drive_t *drive)
 			/* continue polling */
 			return ide_started;
 		}
-		pr_err("%s: reset timed-out, status=0x%02x\n",
-		       hwif->name, tmp);
+		dev_err(hwif->dev, "reset timed-out, status=0x%02x\n", tmp);
 		drive->failures++;
 		err = -EIO;
 	} else  {
 		tmp = ide_read_error(drive);
 
 		if (tmp == 1) {
-			pr_info("%s: reset: success\n", hwif->name);
+			dev_info(hwif->dev, "reset: success\n");
 			drive->failures = 0;
 		} else {
 			ide_reset_report_error(hwif, tmp);

index 75812db..3a53704 100644
@@ -95,7 +95,7 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
 	if ((cmd->tf_flags & IDE_TFLAG_CUSTOM_HANDLER) &&
 	    tf_cmd == ATA_CMD_IDLEIMMEDIATE) {
 		if (tf->lbal != 0xc4) {
-			pr_err("%s: head unload failed!\n", drive->name);
+			dev_err(&drive->gendev, "head unload failed!\n");
 			ide_tf_dump(drive->name, cmd);
 		} else
 			drive->dev_flags |= IDE_DFLAG_PARKED;

@@ -203,7 +203,7 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive)
 	} else if (s->all) {
 		int special = s->all;
 		s->all = 0;
-		pr_err("%s: bad special flag: 0x%02x\n", drive->name, special);
+		dev_err(&drive->gendev, "bad special flag: 0x%02x\n", special);
 		return ide_stopped;
 	}
 

@@ -354,7 +354,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
 	drive->hwif->tp_ops->dev_select(drive);
 	if (ide_wait_stat(&startstop, drive, drive->ready_stat,
 			  ATA_BUSY | ATA_DRQ, WAIT_READY)) {
-		pr_err("%s: drive not ready for command\n", drive->name);
+		dev_err(&drive->gendev, "drive not ready for command\n");
 		return startstop;
 	}
 	if (!drive->special.all) {

@@ -683,7 +683,7 @@ void ide_timer_expiry (unsigned long data)
 				hwif->dma_ops->dma_lost_irq(drive);
 			if (hwif->ack_intr)
 				hwif->ack_intr(hwif);
-			pr_warning("%s: lost interrupt\n", drive->name);
+			dev_warn(&drive->gendev, "lost interrupt\n");
 			startstop = handler(drive);
 		} else {
 			if (drive->waiting_for_dma)

@@ -747,8 +747,9 @@ static void unexpected_intr(int irq, ide_hwif_t *hwif)
 
 		if (time_after(jiffies, last_msgtime + HZ)) {
 			last_msgtime = jiffies;
-			pr_err("%s: unexpected interrupt, status=0x%02x, count=%ld\n",
-			       hwif->name, stat, count);
+			dev_err(hwif->dev,
+				"unexpected interrupt, status=0x%02x, count=%ld\n",
+				stat, count);
 		}
 	}
 }

index aea6cc3..5cd2c17 100644
@@ -167,8 +167,8 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg)
 	     id[ATA_ID_SWDMA_MODES])) {
 		xfer_rate = args[1];
 		if (tf->nsect > XFER_UDMA_2 && !eighty_ninty_three(drive)) {
-			pr_warning("%s: UDMA speeds >UDMA33 cannot be set\n",
-				   drive->name);
+			dev_warn(&drive->gendev,
+				 "UDMA speeds >UDMA33 cannot be set\n");
 			goto abort;
 		}
 	}

index 8fe778c..6dbb96e 100644
@@ -259,10 +259,9 @@ no_80w:
 	if (drive->dev_flags & IDE_DFLAG_UDMA33_WARNED)
 		return 0;
 
-	pr_warning("%s: %s side 80-wire cable detection failed, "
-		   "limiting max speed to UDMA33\n",
-		   drive->name,
-		   hwif->cbl == ATA_CBL_PATA80 ? "drive" : "host");
+	dev_warn(&drive->gendev, "%s side 80-wire cable detection failed, "
+		 "limiting max speed to UDMA33\n",
+		 hwif->cbl == ATA_CBL_PATA80 ? "drive" : "host");
 
 	drive->dev_flags |= IDE_DFLAG_UDMA33_WARNED;
 

@@ -300,7 +299,7 @@ int ide_driveid_update(ide_drive_t *drive)
 out_err:
 	SELECT_MASK(drive, 0);
 	if (rc == 2)
-		pr_err("%s: %s: bad status\n", drive->name, __func__);
+		dev_err(&drive->gendev, "%s: bad status\n", __func__);
 	kfree(id);
 	return 0;
 }

index b7b7474..2f3c111 100644
@@ -42,7 +42,7 @@ static void ide_dump_opcode(ide_drive_t *drive)
 	if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE)
 		cmd = rq->special;
 
-	pr_err("ide: failed opcode was: ");
+	dev_err(&drive->gendev, "ide: failed opcode was: ");
 	if (cmd == NULL)
 		pr_cont("unknown\n");
 	else

@@ -91,7 +91,7 @@ static void ide_dump_sector(ide_drive_t *drive)
 
 static void ide_dump_ata_error(ide_drive_t *drive, u8 err)
 {
-	pr_err("{ ");
+	dev_err(&drive->gendev, "{ ");
 	if (err & ATA_ABORTED)
 		pr_cont("DriveStatusError ");
 	if (err & ATA_ICRC)

@@ -121,7 +121,7 @@ static void ide_dump_ata_error(ide_drive_t *drive, u8 err)
 
 static void ide_dump_atapi_error(ide_drive_t *drive, u8 err)
 {
-	pr_err("{ ");
+	dev_err(&drive->gendev, "{ ");
 	if (err & ATAPI_ILI)
 		pr_cont("IllegalLengthIndication ");
 	if (err & ATAPI_EOM)

@@ -151,7 +151,7 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat)
 {
 	u8 err = 0;
 
-	pr_err("%s: %s: status=0x%02x { ", drive->name, msg, stat);
+	dev_err(&drive->gendev, "%s: status=0x%02x { ", msg, stat);
 	if (stat & ATA_BUSY)
 		pr_cont("Busy ");
 	else {

@@ -173,7 +173,7 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat)
 	pr_cont("}\n");
 	if ((stat & (ATA_BUSY | ATA_ERR)) == ATA_ERR) {
 		err = ide_read_error(drive);
-		pr_err("%s: %s: error=0x%02x ", drive->name, msg, err);
+		dev_err(&drive->gendev, "%s: error=0x%02x ", msg, err);
 		if (drive->media == ide_disk)
 			ide_dump_ata_error(drive, err);
 		else

index 7402bb5..e165f9b 100644
@@ -80,8 +80,8 @@ void ide_complete_power_step(ide_drive_t *drive, struct request *rq)
 	struct request_pm_state *pm = rq->data;
 
 #ifdef DEBUG_PM
-	pr_info("%s: complete_power_step(step: %d)\n",
-		drive->name, pm->pm_step);
+	dev_info(&drive->gendev, "complete_power_step(step: %d)\n",
+		 pm->pm_step);
 #endif
 	if (drive->media != ide_disk)
 		return;

@@ -229,16 +229,17 @@ void ide_check_pm_state(ide_drive_t *drive, struct request *rq)
 		unsigned long flags;
 		int rc;
 #ifdef DEBUG_PM
-		printk("%s: Wakeup request inited, waiting for !BSY...\n", drive->name);
+		dev_info(&drive->gendev,
+			 "Wakeup request inited, waiting for !BSY...\n");
 #endif
 		rc = ide_wait_not_busy(hwif, 35000);
 		if (rc)
-			pr_warning("%s: bus not ready on wakeup\n", drive->name);
+			dev_warn(&drive->gendev, "bus not ready on wakeup\n");
 		tp_ops->dev_select(drive);
 		tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
 		rc = ide_wait_not_busy(hwif, 100000);
 		if (rc)
-			pr_warning("%s: drive not ready on wakeup\n", drive->name);
+			dev_warn(&drive->gendev, "drive not ready on wakeup\n");
 
 		spin_lock_irqsave(q->queue_lock, flags);
 		blk_start_queue(q);

200 lines not on this page · raw message

index 0fa097e..fcc4fcb 100644
@@ -463,13 +463,14 @@ static int ide_replace_subdriver(ide_drive_t *drive, const char *driver)
 	strlcpy(drive->driver_req, driver, sizeof(drive->driver_req));
 	err = device_attach(dev);
 	if (err < 0)
-		pr_warning("IDE: %s: device_attach error: %d\n", __func__, err);
+		dev_warn(dev, "IDE: %s: device_attach error: %d\n",
+			 __func__, err);
 	drive->driver_req[0] = 0;
 	if (dev->driver == NULL) {
 		err = device_attach(dev);
 		if (err < 0)
-			pr_warning("IDE: %s: device_attach(2) error: %d\n",
-				   __func__, err);
+			dev_warn(dev, "IDE: %s: device_attach(2) error: %d\n",
+				 __func__, err);
 	}
 	if (dev->driver && !strcmp(dev->driver->name, driver))
 		ret = 0;

index baf0956..cdaa9af 100644
@@ -86,7 +86,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
 	if (orig_cmd->protocol == ATA_PROT_PIO &&
 	    (orig_cmd->tf_flags & IDE_TFLAG_MULTI_PIO) &&
 	    drive->mult_count == 0) {
-		pr_err("%s: multimode not set!\n", drive->name);
+		dev_err(&drive->gendev, "multimode not set!\n");
 		return ide_stopped;
 	}
 

@@ -215,7 +215,7 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
 	}
 
 	if (stat & ATA_BUSY)
-		pr_err("%s: drive still BUSY!\n", drive->name);
+		dev_err(&drive->gendev, "drive still BUSY!\n");
 
 	return stat;
 }

@@ -399,10 +399,9 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
 
 	if (ide_wait_stat(&startstop, drive, ATA_DRQ,
 			  drive->bad_wstat, WAIT_DRQ)) {
-		pr_err("%s: no DRQ after issuing %sWRITE%s\n",
-		       drive->name,
-		       (cmd->tf_flags & IDE_TFLAG_MULTI_PIO) ? "MULT" : "",
-		       (drive->dev_flags & IDE_DFLAG_LBA48) ? "_EXT" : "");
+		dev_err(&drive->gendev, "no DRQ after issuing %sWRITE%s\n",
+			(cmd->tf_flags & IDE_TFLAG_MULTI_PIO) ? "MULT" : "",
+			(drive->dev_flags & IDE_DFLAG_LBA48) ? "_EXT" : "");
 		return startstop;
 	}
 

@@ -576,8 +575,9 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
 		case TASKFILE_MULTI_OUT:
 			if (!drive->mult_count) {
 				/* (hs): give up if multcount is not set */
-				pr_err("%s: %s Multimode Write multcount is not set\n",
-				       drive->name, __func__);
+				dev_err(&drive->gendev,
+					"%s Multimode Write multcount is not set\n",
+					__func__);
 				err = -EPERM;
 				goto abort;
 			}

@@ -595,8 +595,9 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
 		case TASKFILE_MULTI_IN:
 			if (!drive->mult_count) {
 				/* (hs): give up if multcount is not set */
-				pr_err("%s: %s Multimode Read failure multcount is not set\n",
-				       drive->name, __func__);
+				dev_err(&drive->gendev,
+					"%s Multimode Read failure multcount is not set\n",
+					__func__);
 				err = -EPERM;
 				goto abort;
 			}

@@ -624,8 +625,8 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
 		nsect = (cmd.hob.nsect << 8) | cmd.tf.nsect;
 
 		if (!nsect) {
-			pr_err("%s: in/out command without data\n",
-			       drive->name);
+			dev_err(&drive->gendev,
+				"in/out command without data\n");
 			err = -EFAULT;
 			goto abort;
 		}

index 03d8e14..023d6bb 100644
@@ -70,7 +70,7 @@ u8 ide_get_best_pio_mode(ide_drive_t *drive, u8 mode_wanted, u8 max_mode)
 		pio_mode = ide_scan_pio_blacklist((char *)&id[ATA_ID_PROD]);
 
 	if (pio_mode != -1) {
-		pr_info("%s: is on PIO blacklist\n", drive->name);
+		dev_info(&drive->gendev, "is on PIO blacklist\n");
 	} else {
 		pio_mode = id[ATA_ID_OLD_PIO_MODES] >> 8;
 		if (pio_mode > 2) {	/* 2 is maximum allowed tPIO value */

@@ -96,8 +96,8 @@ u8 ide_get_best_pio_mode(ide_drive_t *drive, u8 mode_wanted, u8 max_mode)
 		}
 
 		if (overridden)
-			pr_info("%s: tPIO > 2, assuming tPIO = 2\n",
-				drive->name);
+			dev_info(&drive->gendev,
+				 "tPIO > 2, assuming tPIO = 2\n");
 	}
 
 	if (pio_mode > max_mode)

index 966c2da..103c6a4 100644
@@ -273,23 +273,23 @@ static void ide_dev_apply_params(ide_drive_t *drive, u8 unit)
 	int i = drive->hwif->index * MAX_DRIVES + unit;
 
 	if (ide_nodma & (1 << i)) {
-		pr_info("ide: disallowing DMA for %s\n", drive->name);
+		dev_info(&drive->gendev, "ide: disallowing DMA\n");
 		drive->dev_flags |= IDE_DFLAG_NODMA;
 	}
 	if (ide_noflush & (1 << i)) {
-		pr_info("ide: disabling flush requests for %s\n", drive->name);
+		dev_info(&drive->gendev, "ide: disabling flush requests\n");
 		drive->dev_flags |= IDE_DFLAG_NOFLUSH;
 	}
 	if (ide_noprobe & (1 << i)) {
-		pr_info("ide: skipping probe for %s\n", drive->name);
+		dev_info(&drive->gendev, "ide: skipping probe\n");
 		drive->dev_flags |= IDE_DFLAG_NOPROBE;
 	}
 	if (ide_nowerr & (1 << i)) {
-		pr_info("ide: ignoring the ATA_DF bit for %s\n", drive->name);
+		dev_info(&drive->gendev, "ide: ignoring the ATA_DF bit\n");
 		drive->bad_wstat = BAD_R_STAT;
 	}
 	if (ide_cdroms & (1 << i)) {
-		pr_info("ide: forcing %s as a CD-ROM\n", drive->name);
+		dev_info(&drive->gendev, "ide: forcing use as a CD-ROM\n");
 		drive->dev_flags |= IDE_DFLAG_PRESENT;
 		drive->media = ide_cdrom;
 		/* an ATAPI device ignores DRDY */

@@ -300,8 +300,9 @@ static void ide_dev_apply_params(ide_drive_t *drive, u8 unit)
 		drive->head = drive->bios_head = ide_disks_chs[i].head;
 		drive->sect = drive->bios_sect = ide_disks_chs[i].sect;
 
-		pr_info("ide: forcing %s as a disk (%d/%d/%d)\n",
-			drive->name, drive->cyl, drive->head, drive->sect);
+		dev_info(&drive->gendev,
+			 "ide: forcing use as a disk (%d/%d/%d)\n",
+			 drive->cyl, drive->head, drive->sect);
 
 		drive->dev_flags |= IDE_DFLAG_FORCED_GEOM | IDE_DFLAG_PRESENT;
 		drive->media = ide_disk;

@@ -340,7 +341,7 @@ void ide_port_apply_params(ide_hwif_t *hwif)
 	int i;
 
 	if (ide_ignore_cable & (1 << hwif->index)) {
-		pr_info("ide: ignoring cable detection for %s\n", hwif->name);
+		dev_info(&hwif->gendev, "ide: ignoring cable detection\n");
 		hwif->cbl = ATA_CBL_PATA40_SHORT;
 	}
 

index 42887b2..b9ec731 100644
@@ -383,10 +383,11 @@ int ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
 			return -1;
 
 		if (hwif->host_flags & IDE_HFLAG_MMIO)
-			pr_info("    %s: MMIO-DMA\n", hwif->name);
+			dev_info(&hwif->gendev, "    MMIO-DMA\n");
 		else
-			pr_info("    %s: BM-DMA at 0x%04lx-0x%04lx\n",
-				hwif->name, base, base + 7);
+			dev_info(&hwif->gendev,
+				 "    BM-DMA at 0x%04lx-0x%04lx\n",
+				 base, base + 7);
 
 		hwif->extra_base = base + (hwif->channel ? 8 : 16);