diff options
author | Jim Cromie <jim.cromie@gmail.com> | 2012-02-01 12:58:49 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 17:24:58 -0500 |
commit | 8ad95f0958d3ea9a182ee4c5449c4847e0577cdc (patch) | |
tree | c7f7f351acc0db8021f6725b72683a533e99784f /arch/x86/platform/scx200 | |
parent | 0ac2526064e5c7da5d1a47b48d37c1345e487258 (diff) |
scx200_32: replace printks with pr_<level>s
update scx200_32.c to use pr_<level>, also 2 whitespaces.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'arch/x86/platform/scx200')
-rw-r--r-- | arch/x86/platform/scx200/scx200_32.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/x86/platform/scx200/scx200_32.c b/arch/x86/platform/scx200/scx200_32.c index 5dfd335ad50c..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"); |
@@ -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 | ||