All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <1202068847.6262.7.camel@localhost.localdomain>

diff --git a/a/1.txt b/N1/1.txt
index 37a41fd..4dcca6a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,7 +8,7 @@ cleanups).
 
 Signed off by: Adrian McMenamin <adrian@mcmen.demon.co.uk>
 
-=======
+==============
 
 
 
@@ -94,8 +94,8 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
  
  static int maple_dma_done(void)
  {
--       return (ctrl_inl(MAPLE_STATE) & 1) = 0;
-+	return (ctrl_inl(MAPLE_STATE) & 1) = 0;
+-       return (ctrl_inl(MAPLE_STATE) & 1) == 0;
++	return (ctrl_inl(MAPLE_STATE) & 1) == 0;
  }
  
  static void maple_release_device(struct device *dev)
@@ -241,7 +241,8 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 -
 -       *maple_sendptr++ = (port << 16) | len | 0x80000000;
 -       *maple_sendptr++ = PHYSADDR(mq->recvbuf);
--       *maple_sendptr++ -           mq->command | (to << 8) | (from << 16) | (len << 24);
+-       *maple_sendptr++ =
+-           mq->command | (to << 8) | (from << 16) | (len << 24);
 +	port = mq->dev->port & 3;
 +	unit = mq->dev->unit;
 +	len = mq->length;
@@ -253,7 +254,8 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 +
 +	*maple_sendptr++ = (port << 16) | len | 0x80000000;
 +	*maple_sendptr++ = PHYSADDR(mq->recvbuf);
-+	*maple_sendptr++ +	    mq->command | (to << 8) | (from << 16) | (len << 24);
++	*maple_sendptr++ =
++	    mq->command | (to << 8) | (from << 16) | (len << 24);
  
 -       while (len-- > 0)
 -               *maple_sendptr++ = *lsendbuf++;
@@ -320,7 +322,7 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 -       mdev = devptr;
 -       maple_drv = to_maple_driver(driver);
 -       if (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) {
--               if (maple_drv->connect(mdev) = 0) {
+-               if (maple_drv->connect(mdev) == 0) {
 -                       mdev->driver = maple_drv;
 -                       return 1;
 -               }
@@ -329,7 +331,7 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 +	mdev = devptr;
 +	maple_drv = to_maple_driver(driver);
 +	if (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) {
-+		if (maple_drv->connect(mdev) = 0) {
++		if (maple_drv->connect(mdev) == 0) {
 +			mdev->driver = maple_drv;
 +			return 1;
 +		}
@@ -382,13 +384,13 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 -       dev->product_licence[60] = '\0';
 -
 -       for (p = dev->product_name + 29; dev->product_name <= p; p--)
--               if (*p = ' ')
+-               if (*p == ' ')
 -                       *p = '\0';
 -               else
 -                       break;
 -
 -       for (p = dev->product_licence + 59; dev->product_licence <= p; p--)
--               if (*p = ' ')
+-               if (*p == ' ')
 -                       *p = '\0';
 -               else
 -                       break;
@@ -405,10 +407,11 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 -                      "Maple bus at (%d, %d): Connected function 0x%lX\n",
 -                      dev->port, dev->unit, function);
 -
--               matched -                   bus_for_each_drv(&maple_bus_type, NULL, dev,
+-               matched =
+-                   bus_for_each_drv(&maple_bus_type, NULL, dev,
 -                                    attach_matching_maple_driver);
 -
--               if (matched = 0) {
+-               if (matched == 0) {
 -                       /* Driver does not exist yet */
 -                       printk(KERN_INFO
 -                              "No maple driver found for this device\n");
@@ -450,13 +453,13 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 +	memcpy(mdev->product_licence, mdev->devinfo.product_licence, 60);
 +	mdev->product_licence[60] = '\0';
 +	for (p = mdev->product_name + 29; mdev->product_name <= p; p--)
-+		if (*p = ' ')
++		if (*p == ' ')
 +			*p = '\0';
 +		else
 +			break;
 +
 +	for (p = mdev->product_licence + 59; mdev->product_licence <= p; p--)
-+		if (*p = ' ')
++		if (*p == ' ')
 +			*p = '\0';
 +		else
 +			break;
@@ -479,10 +482,11 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 +				"Maple bus at (%d, %d): Function 0x%lX\n",
 +				mdev->port, mdev->unit, function);
 +
-+		matched +		    bus_for_each_drv(&maple_bus_type, NULL, mdev,
++		matched =
++		    bus_for_each_drv(&maple_bus_type, NULL, mdev,
 +				     attach_matching_maple_driver);
 +
-+		if (matched = 0) {
++		if (matched == 0) {
 +			/* Driver does not exist yet */
 +			if (realscan)
 +				printk(KERN_INFO
@@ -496,7 +500,7 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 +	mdev->dev.bus = &maple_bus_type;
 +	mdev->dev.parent = &maple_bus;
 +	mdev->dev.release = &maple_release_device;
-+	if (mdev->registered = 0) {
++	if (mdev->registered == 0) {
 +		retval = device_register(&mdev->dev);
 +		if (retval) {
 +			printk(KERN_INFO
@@ -523,12 +527,12 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
  
 -       ds = portptr;
 -       mdev = to_maple_dev(device);
--       if (mdev->port = ds->port && mdev->unit = ds->unit)
+-       if (mdev->port == ds->port && mdev->unit == ds->unit)
 -               return 1;
 -       return 0;
 +	ds = portptr;
 +	mdev = to_maple_dev(device);
-+	if (mdev->port = ds->port && mdev->unit = ds->unit)
++	if (mdev->port == ds->port && mdev->unit == ds->unit)
 +		return 1;
 +	return 0;
  }
@@ -620,7 +624,8 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 -       for (k = 0; k < 5; k++) {
 -               ds.port = mdev->port;
 -               ds.unit = k + 1;
--               retval -                   bus_for_each_dev(&maple_bus_type, NULL, &ds,
+-               retval =
+-                   bus_for_each_dev(&maple_bus_type, NULL, &ds,
 -                                    detach_maple_device);
 -               if (retval) {
 -                       submask = submask >> 1;
@@ -645,7 +650,8 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 +	for (k = 0; k < 5; k++) {
 +		ds.port = mdev->port;
 +		ds.unit = k + 1;
-+		retval +		    bus_for_each_dev(&maple_bus_type, NULL, &ds,
++		retval =
++		    bus_for_each_dev(&maple_bus_type, NULL, &ds,
 +				     detach_maple_device);
 +		if (retval) {
 +			submask = submask >> 1;
@@ -724,11 +730,11 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 +				   char *recvbuf)
  {
 -       char submask;
--       if ((!started) || (scanning = 2)) {
+-       if ((!started) || (scanning == 2)) {
 -               maple_attach_driver(mdev);
 -               return;
 -       }
--       if (mdev->unit = 0) {
+-       if (mdev->unit == 0) {
 -               submask = recvbuf[2] & 0x1F;
 -               if (submask ^ subdevice_map[mdev->port]) {
 -                       maple_map_subunits(mdev, submask);
@@ -736,11 +742,11 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 -               }
 -       }
 +	char submask;
-+	if ((!started) || (scanning = 2)) {
++	if ((!started) || (scanning == 2)) {
 +		maple_attach_driver(mdev);
 +		return;
 +	}
-+	if (mdev->unit = 0) {
++	if (mdev->unit == 0) {
 +		submask = recvbuf[2] & 0x1F;
 +		if (submask ^ subdevice_map[mdev->port]) {
 +			maple_map_subunits(mdev, submask);
@@ -801,13 +807,13 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 -                       }
 -               }
 -               INIT_LIST_HEAD(&maple_sentq);
--               if (scanning = 1) {
+-               if (scanning == 1) {
 -                       maple_send();
 -                       scanning = 2;
 -               } else
 -                       scanning = 0;
 -
--               if (started = 0)
+-               if (started == 0)
 -                       started = 1;
 -       }
 -       maplebus_dma_reset();
@@ -861,13 +867,13 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 +			}
 +		}
 +		INIT_LIST_HEAD(&maple_sentq);
-+		if (scanning = 1) {
++		if (scanning == 1) {
 +			maple_send();
 +			scanning = 2;
 +		} else
 +			scanning = 0;
 +
-+		if (started = 0)
++		if (started == 0)
 +			started = 1;
 +	}
 +	maplebus_dma_reset();
@@ -919,12 +925,14 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
  
  static int maple_get_dma_buffer(void)
  {
--       maple_sendbuf -           (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,
+-       maple_sendbuf =
+-           (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,
 -                                     MAPLE_DMA_PAGES);
 -       if (!maple_sendbuf)
 -               return -ENOMEM;
 -       return 0;
-+	maple_sendbuf +	    (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,
++	maple_sendbuf =
++	    (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,
 +				      MAPLE_DMA_PAGES);
 +	if (!maple_sendbuf)
 +		return -ENOMEM;
@@ -943,7 +951,7 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 -       maple_drv = container_of(drvptr, struct maple_driver, drv);
 -       maple_dev = container_of(devptr, struct maple_device, dev);
 -       /* Trap empty port case */
--       if (maple_dev->devinfo.function = 0xFFFFFFFF)
+-       if (maple_dev->devinfo.function == 0xFFFFFFFF)
 -               return 0;
 -       else if (maple_dev->devinfo.function &
 -                be32_to_cpu(maple_drv->function))
@@ -952,7 +960,7 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 +	maple_drv = container_of(drvptr, struct maple_driver, drv);
 +	maple_dev = container_of(devptr, struct maple_device, dev);
 +	/* Trap empty port case */
-+	if (maple_dev->devinfo.function = 0xFFFFFFFF)
++	if (maple_dev->devinfo.function == 0xFFFFFFFF)
 +		return 0;
 +	else if (maple_dev->devinfo.function &
 +		 be32_to_cpu(maple_drv->function))
@@ -1042,7 +1050,8 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 -               goto cleanup_irq;
 -       }
 -
--       maple_queue_cache -           kmem_cache_create("maple_queue_cache", 0x400, 0,
+-       maple_queue_cache =
+-           kmem_cache_create("maple_queue_cache", 0x400, 0,
 -                             SLAB_HWCACHE_ALIGN, NULL);
 -
 -       if (!maple_queue_cache)
@@ -1106,7 +1115,8 @@ diff -ruN a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
 +		goto cleanup_irq;
 +	}
 +
-+	maple_queue_cache +	    kmem_cache_create("maple_queue_cache", 0x400, 0,
++	maple_queue_cache =
++	    kmem_cache_create("maple_queue_cache", 0x400, 0,
 +			      SLAB_POISON|SLAB_HWCACHE_ALIGN, NULL);
 +
 +	if (!maple_queue_cache)
diff --git a/a/content_digest b/N1/content_digest
index 52a5226..3382eb8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,5 +1,5 @@
  "From\0Adrian McMenamin <adrian@newgolddream.dyndns.info>\0"
- "Subject\0[PATCH] SH/Dreamcast - fix regressions, whitespace and memory\0"
+ "Subject\0[PATCH] SH/Dreamcast - fix regressions, whitespace and memory leaks in Maple Bus driver\0"
  "Date\0Sun, 03 Feb 2008 20:00:47 +0000\0"
  "To\0Paul Mundt <lethal@linux-sh.org>\0"
  "Cc\0linux-sh <linux-sh@vger.kernel.org>"
@@ -17,7 +17,7 @@
  "\n"
  "Signed off by: Adrian McMenamin <adrian@mcmen.demon.co.uk>\n"
  "\n"
- "=======\n"
+ "==============\n"
  "\n"
  "\n"
  "\n"
@@ -103,8 +103,8 @@
  " \n"
  " static int maple_dma_done(void)\n"
  " {\n"
- "-       return (ctrl_inl(MAPLE_STATE) & 1) = 0;\n"
- "+\treturn (ctrl_inl(MAPLE_STATE) & 1) = 0;\n"
+ "-       return (ctrl_inl(MAPLE_STATE) & 1) == 0;\n"
+ "+\treturn (ctrl_inl(MAPLE_STATE) & 1) == 0;\n"
  " }\n"
  " \n"
  " static void maple_release_device(struct device *dev)\n"
@@ -250,7 +250,8 @@
  "-\n"
  "-       *maple_sendptr++ = (port << 16) | len | 0x80000000;\n"
  "-       *maple_sendptr++ = PHYSADDR(mq->recvbuf);\n"
- "-       *maple_sendptr++ -           mq->command | (to << 8) | (from << 16) | (len << 24);\n"
+ "-       *maple_sendptr++ =\n"
+ "-           mq->command | (to << 8) | (from << 16) | (len << 24);\n"
  "+\tport = mq->dev->port & 3;\n"
  "+\tunit = mq->dev->unit;\n"
  "+\tlen = mq->length;\n"
@@ -262,7 +263,8 @@
  "+\n"
  "+\t*maple_sendptr++ = (port << 16) | len | 0x80000000;\n"
  "+\t*maple_sendptr++ = PHYSADDR(mq->recvbuf);\n"
- "+\t*maple_sendptr++ +\t    mq->command | (to << 8) | (from << 16) | (len << 24);\n"
+ "+\t*maple_sendptr++ =\n"
+ "+\t    mq->command | (to << 8) | (from << 16) | (len << 24);\n"
  " \n"
  "-       while (len-- > 0)\n"
  "-               *maple_sendptr++ = *lsendbuf++;\n"
@@ -329,7 +331,7 @@
  "-       mdev = devptr;\n"
  "-       maple_drv = to_maple_driver(driver);\n"
  "-       if (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) {\n"
- "-               if (maple_drv->connect(mdev) = 0) {\n"
+ "-               if (maple_drv->connect(mdev) == 0) {\n"
  "-                       mdev->driver = maple_drv;\n"
  "-                       return 1;\n"
  "-               }\n"
@@ -338,7 +340,7 @@
  "+\tmdev = devptr;\n"
  "+\tmaple_drv = to_maple_driver(driver);\n"
  "+\tif (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) {\n"
- "+\t\tif (maple_drv->connect(mdev) = 0) {\n"
+ "+\t\tif (maple_drv->connect(mdev) == 0) {\n"
  "+\t\t\tmdev->driver = maple_drv;\n"
  "+\t\t\treturn 1;\n"
  "+\t\t}\n"
@@ -391,13 +393,13 @@
  "-       dev->product_licence[60] = '\\0';\n"
  "-\n"
  "-       for (p = dev->product_name + 29; dev->product_name <= p; p--)\n"
- "-               if (*p = ' ')\n"
+ "-               if (*p == ' ')\n"
  "-                       *p = '\\0';\n"
  "-               else\n"
  "-                       break;\n"
  "-\n"
  "-       for (p = dev->product_licence + 59; dev->product_licence <= p; p--)\n"
- "-               if (*p = ' ')\n"
+ "-               if (*p == ' ')\n"
  "-                       *p = '\\0';\n"
  "-               else\n"
  "-                       break;\n"
@@ -414,10 +416,11 @@
  "-                      \"Maple bus at (%d, %d): Connected function 0x%lX\\n\",\n"
  "-                      dev->port, dev->unit, function);\n"
  "-\n"
- "-               matched -                   bus_for_each_drv(&maple_bus_type, NULL, dev,\n"
+ "-               matched =\n"
+ "-                   bus_for_each_drv(&maple_bus_type, NULL, dev,\n"
  "-                                    attach_matching_maple_driver);\n"
  "-\n"
- "-               if (matched = 0) {\n"
+ "-               if (matched == 0) {\n"
  "-                       /* Driver does not exist yet */\n"
  "-                       printk(KERN_INFO\n"
  "-                              \"No maple driver found for this device\\n\");\n"
@@ -459,13 +462,13 @@
  "+\tmemcpy(mdev->product_licence, mdev->devinfo.product_licence, 60);\n"
  "+\tmdev->product_licence[60] = '\\0';\n"
  "+\tfor (p = mdev->product_name + 29; mdev->product_name <= p; p--)\n"
- "+\t\tif (*p = ' ')\n"
+ "+\t\tif (*p == ' ')\n"
  "+\t\t\t*p = '\\0';\n"
  "+\t\telse\n"
  "+\t\t\tbreak;\n"
  "+\n"
  "+\tfor (p = mdev->product_licence + 59; mdev->product_licence <= p; p--)\n"
- "+\t\tif (*p = ' ')\n"
+ "+\t\tif (*p == ' ')\n"
  "+\t\t\t*p = '\\0';\n"
  "+\t\telse\n"
  "+\t\t\tbreak;\n"
@@ -488,10 +491,11 @@
  "+\t\t\t\t\"Maple bus at (%d, %d): Function 0x%lX\\n\",\n"
  "+\t\t\t\tmdev->port, mdev->unit, function);\n"
  "+\n"
- "+\t\tmatched +\t\t    bus_for_each_drv(&maple_bus_type, NULL, mdev,\n"
+ "+\t\tmatched =\n"
+ "+\t\t    bus_for_each_drv(&maple_bus_type, NULL, mdev,\n"
  "+\t\t\t\t     attach_matching_maple_driver);\n"
  "+\n"
- "+\t\tif (matched = 0) {\n"
+ "+\t\tif (matched == 0) {\n"
  "+\t\t\t/* Driver does not exist yet */\n"
  "+\t\t\tif (realscan)\n"
  "+\t\t\t\tprintk(KERN_INFO\n"
@@ -505,7 +509,7 @@
  "+\tmdev->dev.bus = &maple_bus_type;\n"
  "+\tmdev->dev.parent = &maple_bus;\n"
  "+\tmdev->dev.release = &maple_release_device;\n"
- "+\tif (mdev->registered = 0) {\n"
+ "+\tif (mdev->registered == 0) {\n"
  "+\t\tretval = device_register(&mdev->dev);\n"
  "+\t\tif (retval) {\n"
  "+\t\t\tprintk(KERN_INFO\n"
@@ -532,12 +536,12 @@
  " \n"
  "-       ds = portptr;\n"
  "-       mdev = to_maple_dev(device);\n"
- "-       if (mdev->port = ds->port && mdev->unit = ds->unit)\n"
+ "-       if (mdev->port == ds->port && mdev->unit == ds->unit)\n"
  "-               return 1;\n"
  "-       return 0;\n"
  "+\tds = portptr;\n"
  "+\tmdev = to_maple_dev(device);\n"
- "+\tif (mdev->port = ds->port && mdev->unit = ds->unit)\n"
+ "+\tif (mdev->port == ds->port && mdev->unit == ds->unit)\n"
  "+\t\treturn 1;\n"
  "+\treturn 0;\n"
  " }\n"
@@ -629,7 +633,8 @@
  "-       for (k = 0; k < 5; k++) {\n"
  "-               ds.port = mdev->port;\n"
  "-               ds.unit = k + 1;\n"
- "-               retval -                   bus_for_each_dev(&maple_bus_type, NULL, &ds,\n"
+ "-               retval =\n"
+ "-                   bus_for_each_dev(&maple_bus_type, NULL, &ds,\n"
  "-                                    detach_maple_device);\n"
  "-               if (retval) {\n"
  "-                       submask = submask >> 1;\n"
@@ -654,7 +659,8 @@
  "+\tfor (k = 0; k < 5; k++) {\n"
  "+\t\tds.port = mdev->port;\n"
  "+\t\tds.unit = k + 1;\n"
- "+\t\tretval +\t\t    bus_for_each_dev(&maple_bus_type, NULL, &ds,\n"
+ "+\t\tretval =\n"
+ "+\t\t    bus_for_each_dev(&maple_bus_type, NULL, &ds,\n"
  "+\t\t\t\t     detach_maple_device);\n"
  "+\t\tif (retval) {\n"
  "+\t\t\tsubmask = submask >> 1;\n"
@@ -733,11 +739,11 @@
  "+\t\t\t\t   char *recvbuf)\n"
  " {\n"
  "-       char submask;\n"
- "-       if ((!started) || (scanning = 2)) {\n"
+ "-       if ((!started) || (scanning == 2)) {\n"
  "-               maple_attach_driver(mdev);\n"
  "-               return;\n"
  "-       }\n"
- "-       if (mdev->unit = 0) {\n"
+ "-       if (mdev->unit == 0) {\n"
  "-               submask = recvbuf[2] & 0x1F;\n"
  "-               if (submask ^ subdevice_map[mdev->port]) {\n"
  "-                       maple_map_subunits(mdev, submask);\n"
@@ -745,11 +751,11 @@
  "-               }\n"
  "-       }\n"
  "+\tchar submask;\n"
- "+\tif ((!started) || (scanning = 2)) {\n"
+ "+\tif ((!started) || (scanning == 2)) {\n"
  "+\t\tmaple_attach_driver(mdev);\n"
  "+\t\treturn;\n"
  "+\t}\n"
- "+\tif (mdev->unit = 0) {\n"
+ "+\tif (mdev->unit == 0) {\n"
  "+\t\tsubmask = recvbuf[2] & 0x1F;\n"
  "+\t\tif (submask ^ subdevice_map[mdev->port]) {\n"
  "+\t\t\tmaple_map_subunits(mdev, submask);\n"
@@ -810,13 +816,13 @@
  "-                       }\n"
  "-               }\n"
  "-               INIT_LIST_HEAD(&maple_sentq);\n"
- "-               if (scanning = 1) {\n"
+ "-               if (scanning == 1) {\n"
  "-                       maple_send();\n"
  "-                       scanning = 2;\n"
  "-               } else\n"
  "-                       scanning = 0;\n"
  "-\n"
- "-               if (started = 0)\n"
+ "-               if (started == 0)\n"
  "-                       started = 1;\n"
  "-       }\n"
  "-       maplebus_dma_reset();\n"
@@ -870,13 +876,13 @@
  "+\t\t\t}\n"
  "+\t\t}\n"
  "+\t\tINIT_LIST_HEAD(&maple_sentq);\n"
- "+\t\tif (scanning = 1) {\n"
+ "+\t\tif (scanning == 1) {\n"
  "+\t\t\tmaple_send();\n"
  "+\t\t\tscanning = 2;\n"
  "+\t\t} else\n"
  "+\t\t\tscanning = 0;\n"
  "+\n"
- "+\t\tif (started = 0)\n"
+ "+\t\tif (started == 0)\n"
  "+\t\t\tstarted = 1;\n"
  "+\t}\n"
  "+\tmaplebus_dma_reset();\n"
@@ -928,12 +934,14 @@
  " \n"
  " static int maple_get_dma_buffer(void)\n"
  " {\n"
- "-       maple_sendbuf -           (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,\n"
+ "-       maple_sendbuf =\n"
+ "-           (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,\n"
  "-                                     MAPLE_DMA_PAGES);\n"
  "-       if (!maple_sendbuf)\n"
  "-               return -ENOMEM;\n"
  "-       return 0;\n"
- "+\tmaple_sendbuf +\t    (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,\n"
+ "+\tmaple_sendbuf =\n"
+ "+\t    (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,\n"
  "+\t\t\t\t      MAPLE_DMA_PAGES);\n"
  "+\tif (!maple_sendbuf)\n"
  "+\t\treturn -ENOMEM;\n"
@@ -952,7 +960,7 @@
  "-       maple_drv = container_of(drvptr, struct maple_driver, drv);\n"
  "-       maple_dev = container_of(devptr, struct maple_device, dev);\n"
  "-       /* Trap empty port case */\n"
- "-       if (maple_dev->devinfo.function = 0xFFFFFFFF)\n"
+ "-       if (maple_dev->devinfo.function == 0xFFFFFFFF)\n"
  "-               return 0;\n"
  "-       else if (maple_dev->devinfo.function &\n"
  "-                be32_to_cpu(maple_drv->function))\n"
@@ -961,7 +969,7 @@
  "+\tmaple_drv = container_of(drvptr, struct maple_driver, drv);\n"
  "+\tmaple_dev = container_of(devptr, struct maple_device, dev);\n"
  "+\t/* Trap empty port case */\n"
- "+\tif (maple_dev->devinfo.function = 0xFFFFFFFF)\n"
+ "+\tif (maple_dev->devinfo.function == 0xFFFFFFFF)\n"
  "+\t\treturn 0;\n"
  "+\telse if (maple_dev->devinfo.function &\n"
  "+\t\t be32_to_cpu(maple_drv->function))\n"
@@ -1051,7 +1059,8 @@
  "-               goto cleanup_irq;\n"
  "-       }\n"
  "-\n"
- "-       maple_queue_cache -           kmem_cache_create(\"maple_queue_cache\", 0x400, 0,\n"
+ "-       maple_queue_cache =\n"
+ "-           kmem_cache_create(\"maple_queue_cache\", 0x400, 0,\n"
  "-                             SLAB_HWCACHE_ALIGN, NULL);\n"
  "-\n"
  "-       if (!maple_queue_cache)\n"
@@ -1115,7 +1124,8 @@
  "+\t\tgoto cleanup_irq;\n"
  "+\t}\n"
  "+\n"
- "+\tmaple_queue_cache +\t    kmem_cache_create(\"maple_queue_cache\", 0x400, 0,\n"
+ "+\tmaple_queue_cache =\n"
+ "+\t    kmem_cache_create(\"maple_queue_cache\", 0x400, 0,\n"
  "+\t\t\t      SLAB_POISON|SLAB_HWCACHE_ALIGN, NULL);\n"
  "+\n"
  "+\tif (!maple_queue_cache)\n"
@@ -1322,4 +1332,4 @@
  "-#endif /* __LINUX_MAPLE_H */\n"
  "+#endif\t\t\t\t/* __LINUX_MAPLE_H */"
 
-2e88cb9cedb21e50155983d53862ddc2eac80c23fb9a55eb03c6731ee07b8252
+b7ac7d46a24ccccfad30e3d2518b0456fd9ea1857c1b449750042855527440a2

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.