[parisc-linux-cvs] linux deller

[Helge Deller]

--------------Boundary-00=_W3WW4MMY0XO775719GZB
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit

On Saturday 02 February 2002 16:25, Helge Deller wrote:
> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	deller	02/02/02 08:25:15
>
> Modified files:
> 	drivers/gsc    : asp.c dino.c lasi.c wax.c
>
> Log message:
> - don't use __FUNCTION__ as constant string


--------------Boundary-00=_W3WW4MMY0XO775719GZB
Content-Type: text/plain;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="diff"

Index: asp.c
===================================================================
RCS file: /var/cvs/linux/drivers/gsc/asp.c,v
retrieving revision 1.16
diff -u -p -r1.16 asp.c
--- asp.c	2002/01/12 19:01:28	1.16
+++ asp.c	2002/02/02 15:23:55
@@ -81,7 +81,7 @@ asp_init_chip(struct parisc_device *dev)
 	ret = -EBUSY;
 	irq = gsc_claim_irq(&gsc_irq, ASP_GSC_IRQ);
 	if (irq < 0) {
-		printk(KERN_ERR __FUNCTION__ ": cannot get GSC irq\n");
+		printk(KERN_ERR "%s(): cannot get GSC irq\n", __FUNCTION__);
 		goto out;
 	}
 
Index: dino.c
===================================================================
RCS file: /var/cvs/linux/drivers/gsc/dino.c,v
retrieving revision 1.54
diff -u -p -r1.54 dino.c
--- dino.c	2002/01/13 16:01:17	1.54
+++ dino.c	2002/02/02 15:23:56
@@ -292,11 +292,11 @@ dino_mask_irq(void *irq_dev, int irq)
 {
 	struct dino_device *dino_dev = DINO_DEV(irq_dev);
 
-	DBG(KERN_WARNING __FUNCTION__ "(0x%p, %d)\n", irq_dev, irq);
+	DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, irq_dev, irq);
 
 	if (NULL == irq_dev || irq > DINO_IRQS || irq < 0) {
-		printk(KERN_WARNING __FUNCTION__ "(0x%lx, %d) - not a dino irq?\n",
-			(long) irq_dev, irq);
+		printk(KERN_WARNING "%s(0x%lx, %d) - not a dino irq?\n",
+			__FUNCTION__, (long) irq_dev, irq);
 		BUG();
 	} else {
 		/*
@@ -314,10 +314,11 @@ dino_unmask_irq(void *irq_dev, int irq)
 	struct dino_device *dino_dev = DINO_DEV(irq_dev);
 	u32 tmp;
 
-	DBG(KERN_WARNING __FUNCTION__ "(0x%p, %d)\n", irq_dev, irq);
+	DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, irq_dev, irq);
 
 	if (NULL == irq_dev || irq > DINO_IRQS) {
-		printk(KERN_WARNING __FUNCTION__ ": %d not a dino irq?\n", irq);
+		printk(KERN_WARNING "%s(): %d not a dino irq?\n",
+				__FUNCTION__, irq);
 		BUG();
 		return;
 	}
@@ -337,7 +338,8 @@ dino_unmask_irq(void *irq_dev, int irq)
 	*/
 	tmp = gsc_readl(dino_dev->hba.base_addr+DINO_ILR);
 	if (tmp & DINO_MASK_IRQ(irq)) {
-		DBG(KERN_WARNING __FUNCTION__ " IRQ asserted! (ILR 0x%x)\n", tmp);
+		DBG(KERN_WARNING "%s(): IRQ asserted! (ILR 0x%x)\n",
+				__FUNCTION__, tmp);
 		gsc_writel(dino_dev->txn_data, dino_dev->txn_addr);
 	}
 }
@@ -415,8 +417,8 @@ ilr_again:
 
 		mask &= ~(1<<irq);
 
-		DBG(KERN_WARNING __FUNCTION__ "(%x, %p) mask %0x\n",
-			irq, intr_dev, mask);
+		DBG(KERN_WARNING "%s(%x, %p) mask %0x\n",
+			__FUNCTION__, irq, intr_dev, mask);
 		do_irq(&dino_dev->dino_region->action[irq],
 			dino_dev->dino_region->data.irqbase + irq,
 			regs);
@@ -544,8 +546,8 @@ dino_fixup_bus(struct pci_bus *bus)
         struct dino_device *dino_dev = DINO_DEV(bus->sysdata);
 	int port_base = HBA_PORT_BASE(dino_dev->hba.hba_num);
 
-	DBG(KERN_WARNING __FUNCTION__ "(0x%p) bus %d sysdata 0x%p\n",
-				bus, bus->secondary, bus->sysdata);
+	DBG(KERN_WARNING "%s(0x%p) bus %d sysdata 0x%p\n",
+			__FUNCTION__, bus, bus->secondary, bus->sysdata);
 
 	/* Firmware doesn't set up card-mode dino, so we have to */
 	if (is_card_dino(&dino_dev->hba.dev->id))
@@ -697,8 +699,6 @@ dino_common_init(struct parisc_device *d
 	u32 eim;
 	struct gsc_irq gsc_irq;
 	struct resource *res;
-
-	int ret;
 
 	pcibios_register_hba(&dino_dev->hba);
 
Index: lasi.c
===================================================================
RCS file: /var/cvs/linux/drivers/gsc/lasi.c,v
retrieving revision 1.35
diff -u -p -r1.35 lasi.c
--- lasi.c	2002/01/12 19:01:28	1.35
+++ lasi.c	2002/02/02 15:23:56
@@ -193,7 +193,8 @@ lasi_init_chip(struct parisc_device *dev
 	/* the IRQ lasi should use */
 	irq = gsc_alloc_irq(&gsc_irq);
 	if (irq < 0) {
-		printk(KERN_ERR __FUNCTION__ ": cannot get GSC irq\n");
+		printk(KERN_ERR "%s(): cannot get GSC irq\n",
+				__FUNCTION__);
 		kfree(lasi);
 		return -EBUSY;
 	}
Index: wax.c
===================================================================
RCS file: /var/cvs/linux/drivers/gsc/wax.c,v
retrieving revision 1.18
diff -u -p -r1.18 wax.c
--- wax.c	2002/01/12 19:01:28	1.18
+++ wax.c	2002/02/02 15:23:56
@@ -100,7 +100,8 @@ wax_init_chip(struct parisc_device *dev)
 	/* the IRQ wax should use */
 	irq = gsc_claim_irq(&gsc_irq, WAX_GSC_IRQ);
 	if (irq < 0) {
-		printk(KERN_ERR __FUNCTION__ ": cannot get GSC irq\n");
+		printk(KERN_ERR "%s(): cannot get GSC irq\n",
+				__FUNCTION__);
 		kfree(wax);
 		return -EBUSY;
 	}

--------------Boundary-00=_W3WW4MMY0XO775719GZB--