aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 22bb247d0e60..b330a0c9a6a5 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -650,7 +650,7 @@ static inline u8 iic_clckdiv(unsigned int opb)
650 opb /= 1000000; 650 opb /= 1000000;
651 651
652 if (opb < 20 || opb > 150){ 652 if (opb < 20 || opb > 150){
653 printk(KERN_CRIT "ibm-iic: invalid OPB clock frequency %u MHz\n", 653 printk(KERN_WARNING "ibm-iic: invalid OPB clock frequency %u MHz\n",
654 opb); 654 opb);
655 opb = opb < 20 ? 20 : 150; 655 opb = opb < 20 ? 20 : 150;
656 } 656 }
@@ -672,7 +672,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
672 ocp->def->index); 672 ocp->def->index);
673 673
674 if (!(dev = kzalloc(sizeof(*dev), GFP_KERNEL))) { 674 if (!(dev = kzalloc(sizeof(*dev), GFP_KERNEL))) {
675 printk(KERN_CRIT "ibm-iic%d: failed to allocate device data\n", 675 printk(KERN_ERR "ibm-iic%d: failed to allocate device data\n",
676 ocp->def->index); 676 ocp->def->index);
677 return -ENOMEM; 677 return -ENOMEM;
678 } 678 }
@@ -687,7 +687,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
687 } 687 }
688 688
689 if (!(dev->vaddr = ioremap(ocp->def->paddr, sizeof(struct iic_regs)))){ 689 if (!(dev->vaddr = ioremap(ocp->def->paddr, sizeof(struct iic_regs)))){
690 printk(KERN_CRIT "ibm-iic%d: failed to ioremap device registers\n", 690 printk(KERN_ERR "ibm-iic%d: failed to ioremap device registers\n",
691 dev->idx); 691 dev->idx);
692 ret = -ENXIO; 692 ret = -ENXIO;
693 goto fail2; 693 goto fail2;
@@ -745,7 +745,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
745 adap->nr = dev->idx >= 0 ? dev->idx : 0; 745 adap->nr = dev->idx >= 0 ? dev->idx : 0;
746 746
747 if ((ret = i2c_add_numbered_adapter(adap)) < 0) { 747 if ((ret = i2c_add_numbered_adapter(adap)) < 0) {
748 printk(KERN_CRIT "ibm-iic%d: failed to register i2c adapter\n", 748 printk(KERN_ERR "ibm-iic%d: failed to register i2c adapter\n",
749 dev->idx); 749 dev->idx);
750 goto fail; 750 goto fail;
751 } 751 }
@@ -778,7 +778,7 @@ static void __devexit iic_remove(struct ocp_device *ocp)
778 struct ibm_iic_private* dev = (struct ibm_iic_private*)ocp_get_drvdata(ocp); 778 struct ibm_iic_private* dev = (struct ibm_iic_private*)ocp_get_drvdata(ocp);
779 BUG_ON(dev == NULL); 779 BUG_ON(dev == NULL);
780 if (i2c_del_adapter(&dev->adap)){ 780 if (i2c_del_adapter(&dev->adap)){
781 printk(KERN_CRIT "ibm-iic%d: failed to delete i2c adapter :(\n", 781 printk(KERN_ERR "ibm-iic%d: failed to delete i2c adapter :(\n",
782 dev->idx); 782 dev->idx);
783 /* That's *very* bad, just shutdown IRQ ... */ 783 /* That's *very* bad, just shutdown IRQ ... */
784 if (dev->irq >= 0){ 784 if (dev->irq >= 0){