diff options
-rw-r--r-- | drivers/char/tlclk.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c index 12167c04fa4c..bc56df8a3474 100644 --- a/drivers/char/tlclk.c +++ b/drivers/char/tlclk.c | |||
@@ -211,7 +211,7 @@ static int tlclk_open(struct inode *inode, struct file *filp) | |||
211 | result = request_irq(telclk_interrupt, &tlclk_interrupt, | 211 | result = request_irq(telclk_interrupt, &tlclk_interrupt, |
212 | SA_INTERRUPT, "telco_clock", tlclk_interrupt); | 212 | SA_INTERRUPT, "telco_clock", tlclk_interrupt); |
213 | if (result == -EBUSY) { | 213 | if (result == -EBUSY) { |
214 | printk(KERN_ERR "telco_clock: Interrupt can't be reserved!\n"); | 214 | printk(KERN_ERR "tlclk: Interrupt can't be reserved.\n"); |
215 | return -EBUSY; | 215 | return -EBUSY; |
216 | } | 216 | } |
217 | inb(TLCLK_REG6); /* Clear interrupt events */ | 217 | inb(TLCLK_REG6); /* Clear interrupt events */ |
@@ -741,7 +741,7 @@ static int __init tlclk_init(void) | |||
741 | 741 | ||
742 | ret = register_chrdev(tlclk_major, "telco_clock", &tlclk_fops); | 742 | ret = register_chrdev(tlclk_major, "telco_clock", &tlclk_fops); |
743 | if (ret < 0) { | 743 | if (ret < 0) { |
744 | printk(KERN_ERR "telco_clock: can't get major! %d\n", tlclk_major); | 744 | printk(KERN_ERR "tlclk: can't get major %d.\n", tlclk_major); |
745 | return ret; | 745 | return ret; |
746 | } | 746 | } |
747 | alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL); | 747 | alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL); |
@@ -750,7 +750,7 @@ static int __init tlclk_init(void) | |||
750 | 750 | ||
751 | /* Read telecom clock IRQ number (Set by BIOS) */ | 751 | /* Read telecom clock IRQ number (Set by BIOS) */ |
752 | if (!request_region(TLCLK_BASE, 8, "telco_clock")) { | 752 | if (!request_region(TLCLK_BASE, 8, "telco_clock")) { |
753 | printk(KERN_ERR "tlclk: request_region failed! 0x%X\n", | 753 | printk(KERN_ERR "tlclk: request_region 0x%X failed.\n", |
754 | TLCLK_BASE); | 754 | TLCLK_BASE); |
755 | ret = -EBUSY; | 755 | ret = -EBUSY; |
756 | goto out2; | 756 | goto out2; |
@@ -758,7 +758,7 @@ static int __init tlclk_init(void) | |||
758 | telclk_interrupt = (inb(TLCLK_REG7) & 0x0f); | 758 | telclk_interrupt = (inb(TLCLK_REG7) & 0x0f); |
759 | 759 | ||
760 | if (0x0F == telclk_interrupt ) { /* not MCPBL0010 ? */ | 760 | if (0x0F == telclk_interrupt ) { /* not MCPBL0010 ? */ |
761 | printk(KERN_ERR "telclk_interrup = 0x%x non-mcpbl0010 hw\n", | 761 | printk(KERN_ERR "telclk_interrup = 0x%x non-mcpbl0010 hw.\n", |
762 | telclk_interrupt); | 762 | telclk_interrupt); |
763 | ret = -ENXIO; | 763 | ret = -ENXIO; |
764 | goto out3; | 764 | goto out3; |
@@ -768,7 +768,7 @@ static int __init tlclk_init(void) | |||
768 | 768 | ||
769 | ret = misc_register(&tlclk_miscdev); | 769 | ret = misc_register(&tlclk_miscdev); |
770 | if (ret < 0) { | 770 | if (ret < 0) { |
771 | printk(KERN_ERR " misc_register retruns %d\n", ret); | 771 | printk(KERN_ERR "tlclk: misc_register returns %d.\n", ret); |
772 | ret = -EBUSY; | 772 | ret = -EBUSY; |
773 | goto out3; | 773 | goto out3; |
774 | } | 774 | } |
@@ -776,8 +776,7 @@ static int __init tlclk_init(void) | |||
776 | tlclk_device = platform_device_register_simple("telco_clock", | 776 | tlclk_device = platform_device_register_simple("telco_clock", |
777 | -1, NULL, 0); | 777 | -1, NULL, 0); |
778 | if (!tlclk_device) { | 778 | if (!tlclk_device) { |
779 | printk(KERN_ERR " platform_device_register retruns 0x%X\n", | 779 | printk(KERN_ERR "tlclk: platform_device_register failed.\n"); |
780 | (unsigned int) tlclk_device); | ||
781 | ret = -EBUSY; | 780 | ret = -EBUSY; |
782 | goto out4; | 781 | goto out4; |
783 | } | 782 | } |
@@ -785,7 +784,7 @@ static int __init tlclk_init(void) | |||
785 | ret = sysfs_create_group(&tlclk_device->dev.kobj, | 784 | ret = sysfs_create_group(&tlclk_device->dev.kobj, |
786 | &tlclk_attribute_group); | 785 | &tlclk_attribute_group); |
787 | if (ret) { | 786 | if (ret) { |
788 | printk(KERN_ERR "failed to create sysfs device attributes\n"); | 787 | printk(KERN_ERR "tlclk: failed to create sysfs device attributes.\n"); |
789 | sysfs_remove_group(&tlclk_device->dev.kobj, | 788 | sysfs_remove_group(&tlclk_device->dev.kobj, |
790 | &tlclk_attribute_group); | 789 | &tlclk_attribute_group); |
791 | goto out5; | 790 | goto out5; |