diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
commit | 69a7aebcf019ab3ff5764525ad6858fbe23bb86d (patch) | |
tree | 7211df5704b743a7667159748c670a9744164482 /arch | |
parent | d464c92b5234227c1698862a1906827e2e398ae0 (diff) | |
parent | f1f996b66cc3908a8f5ffccc2ff41840e92f3b10 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"It's indeed trivial -- mostly documentation updates and a bunch of
typo fixes from Masanari.
There are also several linux/version.h include removals from Jesper."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
kcore: fix spelling in read_kcore() comment
constify struct pci_dev * in obvious cases
Revert "char: Fix typo in viotape.c"
init: fix wording error in mm_init comment
usb: gadget: Kconfig: fix typo for 'different'
Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
writeback: fix typo in the writeback_control comment
Documentation: Fix multiple typo in Documentation
tpm_tis: fix tis_lock with respect to RCU
Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
Doc: Update numastat.txt
qla4xxx: Add missing spaces to error messages
compiler.h: Fix typo
security: struct security_operations kerneldoc fix
Documentation: broken URL in libata.tmpl
Documentation: broken URL in filesystems.tmpl
mtd: simplify return logic in do_map_probe()
mm: fix comment typo of truncate_inode_pages_range
power: bq27x00: Fix typos in comment
...
Diffstat (limited to 'arch')
-rw-r--r-- | arch/alpha/include/asm/machvec.h | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_dp264.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-bcmring/dma.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/leds.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/lcd_dma.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/db88f5281-setup.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/rd88f5182-setup.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/spear300.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/spear310.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/spear320.c | 2 | ||||
-rw-r--r-- | arch/arm/mm/init.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/pm-simtec.c | 2 | ||||
-rw-r--r-- | arch/ia64/xen/irq_xen.c | 2 | ||||
-rw-r--r-- | arch/mips/bcm63xx/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/include/asm/keylargo.h | 2 | ||||
-rw-r--r-- | arch/score/Kconfig.debug | 2 | ||||
-rw-r--r-- | arch/x86/platform/scx200/scx200_32.c | 24 |
17 files changed, 26 insertions, 31 deletions
diff --git a/arch/alpha/include/asm/machvec.h b/arch/alpha/include/asm/machvec.h index 13cd42743810..72dbf2359270 100644 --- a/arch/alpha/include/asm/machvec.h +++ b/arch/alpha/include/asm/machvec.h | |||
@@ -90,7 +90,7 @@ struct alpha_machine_vector | |||
90 | void (*kill_arch)(int); | 90 | void (*kill_arch)(int); |
91 | 91 | ||
92 | u8 (*pci_swizzle)(struct pci_dev *, u8 *); | 92 | u8 (*pci_swizzle)(struct pci_dev *, u8 *); |
93 | int (*pci_map_irq)(struct pci_dev *, u8, u8); | 93 | int (*pci_map_irq)(const struct pci_dev *, u8, u8); |
94 | struct pci_ops *pci_ops; | 94 | struct pci_ops *pci_ops; |
95 | 95 | ||
96 | struct _alpha_agp_info *(*agp_info)(void); | 96 | struct _alpha_agp_info *(*agp_info)(void); |
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c index bb7f0c7cb17a..13f0717fc7fe 100644 --- a/arch/alpha/kernel/sys_dp264.c +++ b/arch/alpha/kernel/sys_dp264.c | |||
@@ -366,7 +366,7 @@ clipper_init_irq(void) | |||
366 | */ | 366 | */ |
367 | 367 | ||
368 | static int __init | 368 | static int __init |
369 | isa_irq_fixup(struct pci_dev *dev, int irq) | 369 | isa_irq_fixup(const struct pci_dev *dev, int irq) |
370 | { | 370 | { |
371 | u8 irq8; | 371 | u8 irq8; |
372 | 372 | ||
diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c index 1024396797e1..e5fd241fccdc 100644 --- a/arch/arm/mach-bcmring/dma.c +++ b/arch/arm/mach-bcmring/dma.c | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | #include <linux/pfn.h> | 36 | #include <linux/pfn.h> |
37 | #include <linux/atomic.h> | 37 | #include <linux/atomic.h> |
38 | #include <linux/sched.h> | ||
39 | #include <mach/dma.h> | 38 | #include <mach/dma.h> |
40 | 39 | ||
41 | /* ---- Public Variables ------------------------------------------------- */ | 40 | /* ---- Public Variables ------------------------------------------------- */ |
diff --git a/arch/arm/mach-ks8695/leds.c b/arch/arm/mach-ks8695/leds.c index d6f6502ac9b5..4bd707547293 100644 --- a/arch/arm/mach-ks8695/leds.c +++ b/arch/arm/mach-ks8695/leds.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/gpio.h> | ||
15 | 14 | ||
16 | #include <asm/leds.h> | 15 | #include <asm/leds.h> |
17 | #include <mach/devices.h> | 16 | #include <mach/devices.h> |
diff --git a/arch/arm/mach-omap1/lcd_dma.c b/arch/arm/mach-omap1/lcd_dma.c index 453809359ba6..4c5ce7d829c2 100644 --- a/arch/arm/mach-omap1/lcd_dma.c +++ b/arch/arm/mach-omap1/lcd_dma.c | |||
@@ -117,7 +117,7 @@ EXPORT_SYMBOL(omap_set_lcd_dma_b1_mirror); | |||
117 | void omap_set_lcd_dma_b1_vxres(unsigned long vxres) | 117 | void omap_set_lcd_dma_b1_vxres(unsigned long vxres) |
118 | { | 118 | { |
119 | if (cpu_is_omap15xx()) { | 119 | if (cpu_is_omap15xx()) { |
120 | printk(KERN_ERR "DMA virtual resulotion is not supported " | 120 | printk(KERN_ERR "DMA virtual resolution is not supported " |
121 | "in 1510 mode\n"); | 121 | "in 1510 mode\n"); |
122 | BUG(); | 122 | BUG(); |
123 | } | 123 | } |
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c index a104d5a80e11..e52108c9aaea 100644 --- a/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/arch/arm/mach-orion5x/db88f5281-setup.c | |||
@@ -214,7 +214,7 @@ void __init db88f5281_pci_preinit(void) | |||
214 | if (gpio_direction_input(pin) == 0) { | 214 | if (gpio_direction_input(pin) == 0) { |
215 | irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); | 215 | irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); |
216 | } else { | 216 | } else { |
217 | printk(KERN_ERR "db88f5281_pci_preinit faield to " | 217 | printk(KERN_ERR "db88f5281_pci_preinit failed to " |
218 | "set_irq_type pin %d\n", pin); | 218 | "set_irq_type pin %d\n", pin); |
219 | gpio_free(pin); | 219 | gpio_free(pin); |
220 | } | 220 | } |
@@ -227,7 +227,7 @@ void __init db88f5281_pci_preinit(void) | |||
227 | if (gpio_direction_input(pin) == 0) { | 227 | if (gpio_direction_input(pin) == 0) { |
228 | irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); | 228 | irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); |
229 | } else { | 229 | } else { |
230 | printk(KERN_ERR "db88f5281_pci_preinit faield " | 230 | printk(KERN_ERR "db88f5281_pci_preinit failed " |
231 | "to set_irq_type pin %d\n", pin); | 231 | "to set_irq_type pin %d\n", pin); |
232 | gpio_free(pin); | 232 | gpio_free(pin); |
233 | } | 233 | } |
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c index 96438b6b2022..e3ce61711478 100644 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c | |||
@@ -149,7 +149,7 @@ void __init rd88f5182_pci_preinit(void) | |||
149 | if (gpio_direction_input(pin) == 0) { | 149 | if (gpio_direction_input(pin) == 0) { |
150 | irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); | 150 | irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); |
151 | } else { | 151 | } else { |
152 | printk(KERN_ERR "rd88f5182_pci_preinit faield to " | 152 | printk(KERN_ERR "rd88f5182_pci_preinit failed to " |
153 | "set_irq_type pin %d\n", pin); | 153 | "set_irq_type pin %d\n", pin); |
154 | gpio_free(pin); | 154 | gpio_free(pin); |
155 | } | 155 | } |
@@ -162,7 +162,7 @@ void __init rd88f5182_pci_preinit(void) | |||
162 | if (gpio_direction_input(pin) == 0) { | 162 | if (gpio_direction_input(pin) == 0) { |
163 | irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); | 163 | irq_set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); |
164 | } else { | 164 | } else { |
165 | printk(KERN_ERR "rd88f5182_pci_preinit faield to " | 165 | printk(KERN_ERR "rd88f5182_pci_preinit failed to " |
166 | "set_irq_type pin %d\n", pin); | 166 | "set_irq_type pin %d\n", pin); |
167 | gpio_free(pin); | 167 | gpio_free(pin); |
168 | } | 168 | } |
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c index a5e46b4ade20..4f7f5182dd4d 100644 --- a/arch/arm/mach-spear3xx/spear300.c +++ b/arch/arm/mach-spear3xx/spear300.c | |||
@@ -469,7 +469,7 @@ void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, | |||
469 | if (pmx_driver.base) { | 469 | if (pmx_driver.base) { |
470 | ret = pmx_register(&pmx_driver); | 470 | ret = pmx_register(&pmx_driver); |
471 | if (ret) | 471 | if (ret) |
472 | printk(KERN_ERR "padmux: registeration failed. err no" | 472 | printk(KERN_ERR "padmux: registration failed. err no" |
473 | ": %d\n", ret); | 473 | ": %d\n", ret); |
474 | /* Free Mapping, device selection already done */ | 474 | /* Free Mapping, device selection already done */ |
475 | iounmap(pmx_driver.base); | 475 | iounmap(pmx_driver.base); |
diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c index 9004cf9f01bf..febaa6fcfb6a 100644 --- a/arch/arm/mach-spear3xx/spear310.c +++ b/arch/arm/mach-spear3xx/spear310.c | |||
@@ -303,6 +303,6 @@ void __init spear310_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, | |||
303 | 303 | ||
304 | ret = pmx_register(&pmx_driver); | 304 | ret = pmx_register(&pmx_driver); |
305 | if (ret) | 305 | if (ret) |
306 | printk(KERN_ERR "padmux: registeration failed. err no: %d\n", | 306 | printk(KERN_ERR "padmux: registration failed. err no: %d\n", |
307 | ret); | 307 | ret); |
308 | } | 308 | } |
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c index ee29bef43074..deaaf199612c 100644 --- a/arch/arm/mach-spear3xx/spear320.c +++ b/arch/arm/mach-spear3xx/spear320.c | |||
@@ -550,6 +550,6 @@ void __init spear320_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, | |||
550 | 550 | ||
551 | ret = pmx_register(&pmx_driver); | 551 | ret = pmx_register(&pmx_driver); |
552 | if (ret) | 552 | if (ret) |
553 | printk(KERN_ERR "padmux: registeration failed. err no: %d\n", | 553 | printk(KERN_ERR "padmux: registration failed. err no: %d\n", |
554 | ret); | 554 | ret); |
555 | } | 555 | } |
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 5dc7d127a40f..245a55a0a5bb 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -32,7 +32,6 @@ | |||
32 | 32 | ||
33 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
35 | #include <asm/memblock.h> | ||
36 | 35 | ||
37 | #include "mm.h" | 36 | #include "mm.h" |
38 | 37 | ||
diff --git a/arch/arm/plat-s3c24xx/pm-simtec.c b/arch/arm/plat-s3c24xx/pm-simtec.c index 68296b1fe7e5..699f93171297 100644 --- a/arch/arm/plat-s3c24xx/pm-simtec.c +++ b/arch/arm/plat-s3c24xx/pm-simtec.c | |||
@@ -52,7 +52,7 @@ static __init int pm_simtec_init(void) | |||
52 | !machine_is_aml_m5900()) | 52 | !machine_is_aml_m5900()) |
53 | return 0; | 53 | return 0; |
54 | 54 | ||
55 | printk(KERN_INFO "Simtec Board Power Manangement" COPYRIGHT "\n"); | 55 | printk(KERN_INFO "Simtec Board Power Management" COPYRIGHT "\n"); |
56 | 56 | ||
57 | gstatus4 = (__raw_readl(S3C2410_BANKCON7) & 0x3) << 30; | 57 | gstatus4 = (__raw_readl(S3C2410_BANKCON7) & 0x3) << 30; |
58 | gstatus4 |= (__raw_readl(S3C2410_BANKCON6) & 0x3) << 28; | 58 | gstatus4 |= (__raw_readl(S3C2410_BANKCON6) & 0x3) << 28; |
diff --git a/arch/ia64/xen/irq_xen.c b/arch/ia64/xen/irq_xen.c index b279e142c633..3bb12230721f 100644 --- a/arch/ia64/xen/irq_xen.c +++ b/arch/ia64/xen/irq_xen.c | |||
@@ -58,7 +58,7 @@ xen_free_irq_vector(int vector) | |||
58 | 58 | ||
59 | irq_op.vector = vector; | 59 | irq_op.vector = vector; |
60 | if (HYPERVISOR_physdev_op(PHYSDEVOP_free_irq_vector, &irq_op)) | 60 | if (HYPERVISOR_physdev_op(PHYSDEVOP_free_irq_vector, &irq_op)) |
61 | printk(KERN_WARNING "%s: xen_free_irq_vecotr fail vector=%d\n", | 61 | printk(KERN_WARNING "%s: xen_free_irq_vector fail vector=%d\n", |
62 | __func__, vector); | 62 | __func__, vector); |
63 | } | 63 | } |
64 | 64 | ||
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c index d209f85d87bb..356b05583e14 100644 --- a/arch/mips/bcm63xx/setup.c +++ b/arch/mips/bcm63xx/setup.c | |||
@@ -33,7 +33,7 @@ static void bcm6348_a1_reboot(void) | |||
33 | u32 reg; | 33 | u32 reg; |
34 | 34 | ||
35 | /* soft reset all blocks */ | 35 | /* soft reset all blocks */ |
36 | printk(KERN_INFO "soft-reseting all blocks ...\n"); | 36 | printk(KERN_INFO "soft-resetting all blocks ...\n"); |
37 | reg = bcm_perf_readl(PERF_SOFTRESET_REG); | 37 | reg = bcm_perf_readl(PERF_SOFTRESET_REG); |
38 | reg &= ~SOFTRESET_6348_ALL; | 38 | reg &= ~SOFTRESET_6348_ALL; |
39 | bcm_perf_writel(reg, PERF_SOFTRESET_REG); | 39 | bcm_perf_writel(reg, PERF_SOFTRESET_REG); |
diff --git a/arch/powerpc/include/asm/keylargo.h b/arch/powerpc/include/asm/keylargo.h index fc195d0b3c34..2156315d8a90 100644 --- a/arch/powerpc/include/asm/keylargo.h +++ b/arch/powerpc/include/asm/keylargo.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #define KEYLARGO_FCR4 0x48 | 21 | #define KEYLARGO_FCR4 0x48 |
22 | #define KEYLARGO_FCR5 0x4c /* Pangea only */ | 22 | #define KEYLARGO_FCR5 0x4c /* Pangea only */ |
23 | 23 | ||
24 | /* K2 aditional FCRs */ | 24 | /* K2 additional FCRs */ |
25 | #define K2_FCR6 0x34 | 25 | #define K2_FCR6 0x34 |
26 | #define K2_FCR7 0x30 | 26 | #define K2_FCR7 0x30 |
27 | #define K2_FCR8 0x2c | 27 | #define K2_FCR8 0x2c |
diff --git a/arch/score/Kconfig.debug b/arch/score/Kconfig.debug index a1f346df0a71..d8a9b2d146ee 100644 --- a/arch/score/Kconfig.debug +++ b/arch/score/Kconfig.debug | |||
@@ -22,7 +22,7 @@ config RUNTIME_DEBUG | |||
22 | help | 22 | help |
23 | If you say Y here, some debugging macros will do run-time checking. | 23 | If you say Y here, some debugging macros will do run-time checking. |
24 | If you say N here, those macros will mostly turn to no-ops. See | 24 | If you say N here, those macros will mostly turn to no-ops. See |
25 | include/asm-score/debug.h for debuging macros. | 25 | include/asm-score/debug.h for debugging macros. |
26 | If unsure, say N. | 26 | If unsure, say N. |
27 | 27 | ||
28 | endmenu | 28 | endmenu |
diff --git a/arch/x86/platform/scx200/scx200_32.c b/arch/x86/platform/scx200/scx200_32.c index 7e004acbe526..7a9ad30d6c9f 100644 --- a/arch/x86/platform/scx200/scx200_32.c +++ b/arch/x86/platform/scx200/scx200_32.c | |||
@@ -17,8 +17,6 @@ | |||
17 | /* Verify that the configuration block really is there */ | 17 | /* Verify that the configuration block really is there */ |
18 | #define scx200_cb_probe(base) (inw((base) + SCx200_CBA) == (base)) | 18 | #define scx200_cb_probe(base) (inw((base) + SCx200_CBA) == (base)) |
19 | 19 | ||
20 | #define NAME "scx200" | ||
21 | |||
22 | MODULE_AUTHOR("Christer Weinigel <wingel@nano-system.com>"); | 20 | MODULE_AUTHOR("Christer Weinigel <wingel@nano-system.com>"); |
23 | MODULE_DESCRIPTION("NatSemi SCx200 Driver"); | 21 | MODULE_DESCRIPTION("NatSemi SCx200 Driver"); |
24 | MODULE_LICENSE("GPL"); | 22 | MODULE_LICENSE("GPL"); |
@@ -29,10 +27,10 @@ unsigned long scx200_gpio_shadow[2]; | |||
29 | unsigned scx200_cb_base = 0; | 27 | unsigned scx200_cb_base = 0; |
30 | 28 | ||
31 | static struct pci_device_id scx200_tbl[] = { | 29 | static struct pci_device_id scx200_tbl[] = { |
32 | { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) }, | 30 | { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) }, |
33 | { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) }, | 31 | { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) }, |
34 | { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_XBUS) }, | 32 | { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_SCx200_XBUS) }, |
35 | { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_XBUS) }, | 33 | { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_SC1100_XBUS) }, |
36 | { }, | 34 | { }, |
37 | }; | 35 | }; |
38 | MODULE_DEVICE_TABLE(pci,scx200_tbl); | 36 | MODULE_DEVICE_TABLE(pci,scx200_tbl); |
@@ -63,10 +61,11 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_ | |||
63 | if (pdev->device == PCI_DEVICE_ID_NS_SCx200_BRIDGE || | 61 | if (pdev->device == PCI_DEVICE_ID_NS_SCx200_BRIDGE || |
64 | pdev->device == PCI_DEVICE_ID_NS_SC1100_BRIDGE) { | 62 | pdev->device == PCI_DEVICE_ID_NS_SC1100_BRIDGE) { |
65 | base = pci_resource_start(pdev, 0); | 63 | base = pci_resource_start(pdev, 0); |
66 | printk(KERN_INFO NAME ": GPIO base 0x%x\n", base); | 64 | pr_info("GPIO base 0x%x\n", base); |
67 | 65 | ||
68 | if (!request_region(base, SCx200_GPIO_SIZE, "NatSemi SCx200 GPIO")) { | 66 | if (!request_region(base, SCx200_GPIO_SIZE, |
69 | printk(KERN_ERR NAME ": can't allocate I/O for GPIOs\n"); | 67 | "NatSemi SCx200 GPIO")) { |
68 | pr_err("can't allocate I/O for GPIOs\n"); | ||
70 | return -EBUSY; | 69 | return -EBUSY; |
71 | } | 70 | } |
72 | 71 | ||
@@ -82,11 +81,11 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_ | |||
82 | if (scx200_cb_probe(base)) { | 81 | if (scx200_cb_probe(base)) { |
83 | scx200_cb_base = base; | 82 | scx200_cb_base = base; |
84 | } else { | 83 | } else { |
85 | printk(KERN_WARNING NAME ": Configuration Block not found\n"); | 84 | pr_warn("Configuration Block not found\n"); |
86 | return -ENODEV; | 85 | return -ENODEV; |
87 | } | 86 | } |
88 | } | 87 | } |
89 | printk(KERN_INFO NAME ": Configuration Block base 0x%x\n", scx200_cb_base); | 88 | pr_info("Configuration Block base 0x%x\n", scx200_cb_base); |
90 | } | 89 | } |
91 | 90 | ||
92 | return 0; | 91 | return 0; |
@@ -111,8 +110,7 @@ u32 scx200_gpio_configure(unsigned index, u32 mask, u32 bits) | |||
111 | 110 | ||
112 | static int __init scx200_init(void) | 111 | static int __init scx200_init(void) |
113 | { | 112 | { |
114 | printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n"); | 113 | pr_info("NatSemi SCx200 Driver\n"); |
115 | |||
116 | return pci_register_driver(&scx200_pci_driver); | 114 | return pci_register_driver(&scx200_pci_driver); |
117 | } | 115 | } |
118 | 116 | ||