lkml.org 
[lkml]   [2004]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
Subject[PATCH] : Megaraid patch for 2.6 4/5
From
Date
Hi all,

This updates some dmesg comments in the 2.6 driver, to make them more
textually consistent.

diff --recursive --ignore-all-space --unified linux-2.6.2.o/drivers/scsi/megaraid.c linux-2.6.2.megaraid/drivers/scsi/megaraid.c
--- linux-2.6.2.o/drivers/scsi/megaraid.c 2004-02-20 01:32:30.000000000 +0100
+++ linux-2.6.2.megaraid/drivers/scsi/megaraid.c 2004-02-20 01:32:34.000000000 +0100
@@ -4587,7 +4587,7 @@
subsysvid = pdev->subsystem_vendor;
subsysid = pdev->subsystem_device;

- printk(KERN_NOTICE "megaraid: found 0x%4.04x:0x%4.04x:bus %d:",
+ printk(KERN_NOTICE "megaraid: notified of 0x%4.04x:0x%4.04x:bus %d:",
id->vendor, id->device, pci_bus);

printk("slot %d:func %d\n",
@@ -4602,7 +4602,7 @@
flag |= BOARD_MEMMAP;

if (!request_mem_region(mega_baseport, 128, "megaraid")) {
- printk(KERN_WARNING "megaraid: mem region busy!\n");
+ printk(KERN_WARNING "megaraid: mem region busy\n");
goto out_disable_device;
}

@@ -4629,7 +4629,7 @@
memset(adapter, 0, sizeof(adapter_t));

printk(KERN_NOTICE
- "scsi%d:Found MegaRAID controller at 0x%lx, IRQ:%d\n",
+ "scsi%d: found MegaRAID controller at 0x%lx, IRQ:%d\n",
host->host_no, mega_baseport, irq);

adapter->base = mega_baseport;
@@ -4665,13 +4665,13 @@
adapter->mega_buffer = pci_alloc_consistent(adapter->dev,
MEGA_BUFFER_SIZE, &adapter->buf_dma_handle);
if (!adapter->mega_buffer) {
- printk(KERN_WARNING "megaraid: out of RAM.\n");
+ printk(KERN_WARNING "megaraid: out of RAM\n");
goto out_host_put;
}

adapter->scb_list = kmalloc(sizeof(scb_t) * MAX_COMMANDS, GFP_KERNEL);
if (!adapter->scb_list) {
- printk(KERN_WARNING "megaraid: out of RAM.\n");
+ printk(KERN_WARNING "megaraid: out of RAM\n");
goto out_free_cmd_buffer;
}

@@ -4679,7 +4679,7 @@
megaraid_isr_memmapped : megaraid_isr_iomapped,
SA_SHIRQ, "megaraid", adapter)) {
printk(KERN_WARNING
- "megaraid: Couldn't register IRQ %d!\n", irq);
+ "megaraid: couldn't register IRQ %d\n", irq);
goto out_free_scb_list;
}

diff --recursive --ignore-all-space --unified linux-2.6.2.o/drivers/scsi/megaraid.c linux-2.6.2.megaraid/drivers/scsi/megaraid.c
--- linux-2.6.2.o/drivers/scsi/megaraid.c 2004-02-20 01:32:30.000000000 +0100
+++ linux-2.6.2.megaraid/drivers/scsi/megaraid.c 2004-02-20 01:32:34.000000000 +0100
@@ -4587,7 +4587,7 @@
subsysvid = pdev->subsystem_vendor;
subsysid = pdev->subsystem_device;

- printk(KERN_NOTICE "megaraid: found 0x%4.04x:0x%4.04x:bus %d:",
+ printk(KERN_NOTICE "megaraid: notified of 0x%4.04x:0x%4.04x:bus %d:",
id->vendor, id->device, pci_bus);

printk("slot %d:func %d\n",
@@ -4602,7 +4602,7 @@
flag |= BOARD_MEMMAP;

if (!request_mem_region(mega_baseport, 128, "megaraid")) {
- printk(KERN_WARNING "megaraid: mem region busy!\n");
+ printk(KERN_WARNING "megaraid: mem region busy\n");
goto out_disable_device;
}

@@ -4629,7 +4629,7 @@
memset(adapter, 0, sizeof(adapter_t));

printk(KERN_NOTICE
- "scsi%d:Found MegaRAID controller at 0x%lx, IRQ:%d\n",
+ "scsi%d: found MegaRAID controller at 0x%lx, IRQ:%d\n",
host->host_no, mega_baseport, irq);

adapter->base = mega_baseport;
@@ -4665,13 +4665,13 @@
adapter->mega_buffer = pci_alloc_consistent(adapter->dev,
MEGA_BUFFER_SIZE, &adapter->buf_dma_handle);
if (!adapter->mega_buffer) {
- printk(KERN_WARNING "megaraid: out of RAM.\n");
+ printk(KERN_WARNING "megaraid: out of RAM\n");
goto out_host_put;
}

adapter->scb_list = kmalloc(sizeof(scb_t) * MAX_COMMANDS, GFP_KERNEL);
if (!adapter->scb_list) {
- printk(KERN_WARNING "megaraid: out of RAM.\n");
+ printk(KERN_WARNING "megaraid: out of RAM\n");
goto out_free_cmd_buffer;
}

@@ -4679,7 +4679,7 @@
megaraid_isr_memmapped : megaraid_isr_iomapped,
SA_SHIRQ, "megaraid", adapter)) {
printk(KERN_WARNING
- "megaraid: Couldn't register IRQ %d!\n", irq);
+ "megaraid: couldn't register IRQ %d\n", irq);
goto out_free_scb_list;
}
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2005-03-22 14:01    [W:0.033 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site