Re: [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros

[Bartlomiej Zolnierkiewicz]

On Thursday 03 January 2008, Borislav Petkov wrote:
> There should be no functional change resulting from this patch.

the patch is fine but the description is a bit inaccurate:

* some debug_log() calls were not using "ide-floppy: " prefix

* a few used printk levels different than KERN_INFO (KERN_NOTICE
  and KERN_ERR, which is the default one if no level is given)

please fix the description and move the patch at the beggining of
the patch series

> Signed-off-by: Borislav Petkov <[EMAIL PROTECTED]>
> ---
>  drivers/ide/ide-floppy.c |   58 +
>  drivers/ide/ide-floppy.h |3 +-
>  2 files changed, 29 insertions(+), 32 deletions(-)
> 
> diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
> index 4fb6128..196a697 100644
> --- a/drivers/ide/ide-floppy.c
> +++ b/drivers/ide/ide-floppy.c
> @@ -105,7 +105,7 @@ static int idefloppy_do_end_request(ide_drive_t *drive, 
> int uptodate, int nsecs)
>   struct request *rq = HWGROUP(drive)->rq;
>   int error;
>  
> - debug_log(KERN_INFO "Reached idefloppy_end_request\n");
> + debug_log("Reached %s\n", __FUNCTION__);
>  
>   switch (uptodate) {
>   case 0: error = IDEFLOPPY_ERROR_GENERAL; break;
> @@ -257,13 +257,12 @@ static void idefloppy_analyze_error (ide_drive_t *drive,
>   floppy->progress_indication = result->sksv[0] & 0x80 ?
>   (u16)get_unaligned((u16 *)(result->sksv+1)):0x1;
>   if (floppy->failed_pc)
> - debug_log(KERN_INFO "ide-floppy: pc = %x, sense key = %x, "
> - "asc = %x, ascq = %x\n", floppy->failed_pc->c[0],
> - result->sense_key, result->asc, result->ascq);
> + debug_log("pc = %x, sense key = %x, asc = %x, ascq = %x\n",
> + floppy->failed_pc->c[0], result->sense_key,
> + result->asc, result->ascq);
>   else
> - debug_log(KERN_INFO "ide-floppy: sense key = %x, asc = %x, "
> - "ascq = %x\n", result->sense_key,
> - result->asc, result->ascq);
> + debug_log("sense key = %x, asc = %x, ascq = %x\n",
> + result->sense_key, result->asc, result->ascq);
>  }
>  
>  static void idefloppy_request_sense_callback (ide_drive_t *drive)
> @@ -271,7 +270,7 @@ static void idefloppy_request_sense_callback (ide_drive_t 
> *drive)
>   idefloppy_t *floppy = drive->driver_data;
>   u8 *buf = floppy->pc->buffer;
>  
> - debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);
> + debug_log("Reached %s\n", __FUNCTION__);
>  
>   if (!floppy->pc->error) {
>   idefloppy_analyze_error(drive, (rq_sense_res_t *) buf);
> @@ -291,7 +290,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive)
>  {
>   idefloppy_t *floppy = drive->driver_data;
>  
> - debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);
> + debug_log("Reached %s\n", __FUNCTION__);
>  
>   idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0);
>  }
> @@ -351,8 +350,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t 
> *drive)
>   struct request *rq = pc->rq;
>   unsigned int temp;
>  
> - debug_log(KERN_INFO "ide-floppy: Reached %s interrupt handler\n",
> - __FUNCTION__);
> + debug_log("Reached %s interrupt handler\n", __FUNCTION__);
>  
>   if (test_bit(PC_DMA_IN_PROGRESS, >flags)) {
>   if (HWIF(drive)->ide_dma_end(drive)) {
> @@ -361,23 +359,23 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t 
> *drive)
>   pc->actually_transferred = pc->request_transfer;
>   idefloppy_update_buffers(drive, pc);
>   }
> - debug_log(KERN_INFO "ide-floppy: DMA finished\n");
> + debug_log("%s: DMA finished\n", __FUNCTION__);
>   }
>  
>   /* Clear the interrupt */
>   status.all = HWIF(drive)->INB(IDE_STATUS_REG);
>  
>   if (!status.b.drq) {/* No more interrupts */
> - debug_log(KERN_INFO "Packet command completed, %d bytes "
> - "transferred\n", pc->actually_transferred);
> + debug_log("Packet command completed, %d bytes transferred\n",
> + pc->actually_transferred);
> +
>   clear_bit(PC_DMA_IN_PROGRESS, >flags);
>  
>   local_irq_enable_in_hardirq();
>  
>   if (status.b.check || test_bit(PC_DMA_ERROR, >flags)) {
>   /* Error detected */
> - debug_log(KERN_INFO "ide-floppy: %s: I/O error\n",
> - drive->name);
> + debug_log("%s: I/O error\n", drive->name);
>   rq->errors++;
>   if (pc->c[0] == GPCMD_REQUEST_SENSE) {
>   printk(KERN_ERR "ide-floppy: I/O error in "
> @@ -438,9 +436,8 @@ static 

[RESEND PATCH 04/10] ide-floppy: cleanup debugging macros

[Borislav Petkov]

There should be no functional change resulting from this patch.

Signed-off-by: Borislav Petkov <[EMAIL PROTECTED]>
---
 drivers/ide/ide-floppy.c |   58 +
 drivers/ide/ide-floppy.h |3 +-
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 4fb6128..196a697 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -105,7 +105,7 @@ static int idefloppy_do_end_request(ide_drive_t *drive, int 
uptodate, int nsecs)
struct request *rq = HWGROUP(drive)->rq;
int error;
 
-   debug_log(KERN_INFO "Reached idefloppy_end_request\n");
+   debug_log("Reached %s\n", __FUNCTION__);
 
switch (uptodate) {
case 0: error = IDEFLOPPY_ERROR_GENERAL; break;
@@ -257,13 +257,12 @@ static void idefloppy_analyze_error (ide_drive_t *drive,
floppy->progress_indication = result->sksv[0] & 0x80 ?
(u16)get_unaligned((u16 *)(result->sksv+1)):0x1;
if (floppy->failed_pc)
-   debug_log(KERN_INFO "ide-floppy: pc = %x, sense key = %x, "
-   "asc = %x, ascq = %x\n", floppy->failed_pc->c[0],
-   result->sense_key, result->asc, result->ascq);
+   debug_log("pc = %x, sense key = %x, asc = %x, ascq = %x\n",
+   floppy->failed_pc->c[0], result->sense_key,
+   result->asc, result->ascq);
else
-   debug_log(KERN_INFO "ide-floppy: sense key = %x, asc = %x, "
-   "ascq = %x\n", result->sense_key,
-   result->asc, result->ascq);
+   debug_log("sense key = %x, asc = %x, ascq = %x\n",
+   result->sense_key, result->asc, result->ascq);
 }
 
 static void idefloppy_request_sense_callback (ide_drive_t *drive)
@@ -271,7 +270,7 @@ static void idefloppy_request_sense_callback (ide_drive_t 
*drive)
idefloppy_t *floppy = drive->driver_data;
u8 *buf = floppy->pc->buffer;
 
-   debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);
+   debug_log("Reached %s\n", __FUNCTION__);
 
if (!floppy->pc->error) {
idefloppy_analyze_error(drive, (rq_sense_res_t *) buf);
@@ -291,7 +290,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive)
 {
idefloppy_t *floppy = drive->driver_data;
 
-   debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);
+   debug_log("Reached %s\n", __FUNCTION__);
 
idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0);
 }
@@ -351,8 +350,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t 
*drive)
struct request *rq = pc->rq;
unsigned int temp;
 
-   debug_log(KERN_INFO "ide-floppy: Reached %s interrupt handler\n",
-   __FUNCTION__);
+   debug_log("Reached %s interrupt handler\n", __FUNCTION__);
 
if (test_bit(PC_DMA_IN_PROGRESS, >flags)) {
if (HWIF(drive)->ide_dma_end(drive)) {
@@ -361,23 +359,23 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t 
*drive)
pc->actually_transferred = pc->request_transfer;
idefloppy_update_buffers(drive, pc);
}
-   debug_log(KERN_INFO "ide-floppy: DMA finished\n");
+   debug_log("%s: DMA finished\n", __FUNCTION__);
}
 
/* Clear the interrupt */
status.all = HWIF(drive)->INB(IDE_STATUS_REG);
 
if (!status.b.drq) {/* No more interrupts */
-   debug_log(KERN_INFO "Packet command completed, %d bytes "
-   "transferred\n", pc->actually_transferred);
+   debug_log("Packet command completed, %d bytes transferred\n",
+   pc->actually_transferred);
+
clear_bit(PC_DMA_IN_PROGRESS, >flags);
 
local_irq_enable_in_hardirq();
 
if (status.b.check || test_bit(PC_DMA_ERROR, >flags)) {
/* Error detected */
-   debug_log(KERN_INFO "ide-floppy: %s: I/O error\n",
-   drive->name);
+   debug_log("%s: I/O error\n", drive->name);
rq->errors++;
if (pc->c[0] == GPCMD_REQUEST_SENSE) {
printk(KERN_ERR "ide-floppy: I/O error in "
@@ -438,9 +436,8 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t 
*drive)
NULL);
return ide_started;
}
-   debug_log(KERN_NOTICE "ide-floppy: The floppy wants to "
-   "send us more data than expected - "
-   "allowing transfer\n");
+   debug_log("The floppy wants to send us more data than"
+   

[RESEND PATCH 04/10] ide-floppy: cleanup debugging macros

[Borislav Petkov]

There should be no functional change resulting from this patch.

Signed-off-by: Borislav Petkov [EMAIL PROTECTED]
---
 drivers/ide/ide-floppy.c |   58 +
 drivers/ide/ide-floppy.h |3 +-
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 4fb6128..196a697 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -105,7 +105,7 @@ static int idefloppy_do_end_request(ide_drive_t *drive, int 
uptodate, int nsecs)
struct request *rq = HWGROUP(drive)-rq;
int error;
 
-   debug_log(KERN_INFO Reached idefloppy_end_request\n);
+   debug_log(Reached %s\n, __FUNCTION__);
 
switch (uptodate) {
case 0: error = IDEFLOPPY_ERROR_GENERAL; break;
@@ -257,13 +257,12 @@ static void idefloppy_analyze_error (ide_drive_t *drive,
floppy-progress_indication = result-sksv[0]  0x80 ?
(u16)get_unaligned((u16 *)(result-sksv+1)):0x1;
if (floppy-failed_pc)
-   debug_log(KERN_INFO ide-floppy: pc = %x, sense key = %x, 
-   asc = %x, ascq = %x\n, floppy-failed_pc-c[0],
-   result-sense_key, result-asc, result-ascq);
+   debug_log(pc = %x, sense key = %x, asc = %x, ascq = %x\n,
+   floppy-failed_pc-c[0], result-sense_key,
+   result-asc, result-ascq);
else
-   debug_log(KERN_INFO ide-floppy: sense key = %x, asc = %x, 
-   ascq = %x\n, result-sense_key,
-   result-asc, result-ascq);
+   debug_log(sense key = %x, asc = %x, ascq = %x\n,
+   result-sense_key, result-asc, result-ascq);
 }
 
 static void idefloppy_request_sense_callback (ide_drive_t *drive)
@@ -271,7 +270,7 @@ static void idefloppy_request_sense_callback (ide_drive_t 
*drive)
idefloppy_t *floppy = drive-driver_data;
u8 *buf = floppy-pc-buffer;
 
-   debug_log(KERN_INFO ide-floppy: Reached %s\n, __FUNCTION__);
+   debug_log(Reached %s\n, __FUNCTION__);
 
if (!floppy-pc-error) {
idefloppy_analyze_error(drive, (rq_sense_res_t *) buf);
@@ -291,7 +290,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive)
 {
idefloppy_t *floppy = drive-driver_data;
 
-   debug_log(KERN_INFO ide-floppy: Reached %s\n, __FUNCTION__);
+   debug_log(Reached %s\n, __FUNCTION__);
 
idefloppy_do_end_request(drive, floppy-pc-error ? 0 : 1, 0);
 }
@@ -351,8 +350,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t 
*drive)
struct request *rq = pc-rq;
unsigned int temp;
 
-   debug_log(KERN_INFO ide-floppy: Reached %s interrupt handler\n,
-   __FUNCTION__);
+   debug_log(Reached %s interrupt handler\n, __FUNCTION__);
 
if (test_bit(PC_DMA_IN_PROGRESS, pc-flags)) {
if (HWIF(drive)-ide_dma_end(drive)) {
@@ -361,23 +359,23 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t 
*drive)
pc-actually_transferred = pc-request_transfer;
idefloppy_update_buffers(drive, pc);
}
-   debug_log(KERN_INFO ide-floppy: DMA finished\n);
+   debug_log(%s: DMA finished\n, __FUNCTION__);
}
 
/* Clear the interrupt */
status.all = HWIF(drive)-INB(IDE_STATUS_REG);
 
if (!status.b.drq) {/* No more interrupts */
-   debug_log(KERN_INFO Packet command completed, %d bytes 
-   transferred\n, pc-actually_transferred);
+   debug_log(Packet command completed, %d bytes transferred\n,
+   pc-actually_transferred);
+
clear_bit(PC_DMA_IN_PROGRESS, pc-flags);
 
local_irq_enable_in_hardirq();
 
if (status.b.check || test_bit(PC_DMA_ERROR, pc-flags)) {
/* Error detected */
-   debug_log(KERN_INFO ide-floppy: %s: I/O error\n,
-   drive-name);
+   debug_log(%s: I/O error\n, drive-name);
rq-errors++;
if (pc-c[0] == GPCMD_REQUEST_SENSE) {
printk(KERN_ERR ide-floppy: I/O error in 
@@ -438,9 +436,8 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t 
*drive)
NULL);
return ide_started;
}
-   debug_log(KERN_NOTICE ide-floppy: The floppy wants to 
-   send us more data than expected - 
-   allowing transfer\n);
+   debug_log(The floppy wants to send us more data than
+   expected - allowing transfer\n);
}
  

Re: [RESEND PATCH 04/10] ide-floppy: cleanup debugging macros

[Bartlomiej Zolnierkiewicz]

On Thursday 03 January 2008, Borislav Petkov wrote:
 There should be no functional change resulting from this patch.

the patch is fine but the description is a bit inaccurate:

* some debug_log() calls were not using ide-floppy:  prefix

* a few used printk levels different than KERN_INFO (KERN_NOTICE
  and KERN_ERR, which is the default one if no level is given)

please fix the description and move the patch at the beggining of
the patch series

 Signed-off-by: Borislav Petkov [EMAIL PROTECTED]
 ---
  drivers/ide/ide-floppy.c |   58 +
  drivers/ide/ide-floppy.h |3 +-
  2 files changed, 29 insertions(+), 32 deletions(-)
 
 diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
 index 4fb6128..196a697 100644
 --- a/drivers/ide/ide-floppy.c
 +++ b/drivers/ide/ide-floppy.c
 @@ -105,7 +105,7 @@ static int idefloppy_do_end_request(ide_drive_t *drive, 
 int uptodate, int nsecs)
   struct request *rq = HWGROUP(drive)-rq;
   int error;
  
 - debug_log(KERN_INFO Reached idefloppy_end_request\n);
 + debug_log(Reached %s\n, __FUNCTION__);
  
   switch (uptodate) {
   case 0: error = IDEFLOPPY_ERROR_GENERAL; break;
 @@ -257,13 +257,12 @@ static void idefloppy_analyze_error (ide_drive_t *drive,
   floppy-progress_indication = result-sksv[0]  0x80 ?
   (u16)get_unaligned((u16 *)(result-sksv+1)):0x1;
   if (floppy-failed_pc)
 - debug_log(KERN_INFO ide-floppy: pc = %x, sense key = %x, 
 - asc = %x, ascq = %x\n, floppy-failed_pc-c[0],
 - result-sense_key, result-asc, result-ascq);
 + debug_log(pc = %x, sense key = %x, asc = %x, ascq = %x\n,
 + floppy-failed_pc-c[0], result-sense_key,
 + result-asc, result-ascq);
   else
 - debug_log(KERN_INFO ide-floppy: sense key = %x, asc = %x, 
 - ascq = %x\n, result-sense_key,
 - result-asc, result-ascq);
 + debug_log(sense key = %x, asc = %x, ascq = %x\n,
 + result-sense_key, result-asc, result-ascq);
  }
  
  static void idefloppy_request_sense_callback (ide_drive_t *drive)
 @@ -271,7 +270,7 @@ static void idefloppy_request_sense_callback (ide_drive_t 
 *drive)
   idefloppy_t *floppy = drive-driver_data;
   u8 *buf = floppy-pc-buffer;
  
 - debug_log(KERN_INFO ide-floppy: Reached %s\n, __FUNCTION__);
 + debug_log(Reached %s\n, __FUNCTION__);
  
   if (!floppy-pc-error) {
   idefloppy_analyze_error(drive, (rq_sense_res_t *) buf);
 @@ -291,7 +290,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive)
  {
   idefloppy_t *floppy = drive-driver_data;
  
 - debug_log(KERN_INFO ide-floppy: Reached %s\n, __FUNCTION__);
 + debug_log(Reached %s\n, __FUNCTION__);
  
   idefloppy_do_end_request(drive, floppy-pc-error ? 0 : 1, 0);
  }
 @@ -351,8 +350,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t 
 *drive)
   struct request *rq = pc-rq;
   unsigned int temp;
  
 - debug_log(KERN_INFO ide-floppy: Reached %s interrupt handler\n,
 - __FUNCTION__);
 + debug_log(Reached %s interrupt handler\n, __FUNCTION__);
  
   if (test_bit(PC_DMA_IN_PROGRESS, pc-flags)) {
   if (HWIF(drive)-ide_dma_end(drive)) {
 @@ -361,23 +359,23 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t 
 *drive)
   pc-actually_transferred = pc-request_transfer;
   idefloppy_update_buffers(drive, pc);
   }
 - debug_log(KERN_INFO ide-floppy: DMA finished\n);
 + debug_log(%s: DMA finished\n, __FUNCTION__);
   }
  
   /* Clear the interrupt */
   status.all = HWIF(drive)-INB(IDE_STATUS_REG);
  
   if (!status.b.drq) {/* No more interrupts */
 - debug_log(KERN_INFO Packet command completed, %d bytes 
 - transferred\n, pc-actually_transferred);
 + debug_log(Packet command completed, %d bytes transferred\n,
 + pc-actually_transferred);
 +
   clear_bit(PC_DMA_IN_PROGRESS, pc-flags);
  
   local_irq_enable_in_hardirq();
  
   if (status.b.check || test_bit(PC_DMA_ERROR, pc-flags)) {
   /* Error detected */
 - debug_log(KERN_INFO ide-floppy: %s: I/O error\n,
 - drive-name);
 + debug_log(%s: I/O error\n, drive-name);
   rq-errors++;
   if (pc-c[0] == GPCMD_REQUEST_SENSE) {
   printk(KERN_ERR ide-floppy: I/O error in 
 @@ -438,9 +436,8 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t 
 *drive)
   NULL);
   return ide_started;
   }
 -