Skip to contentSkip to conversation

dma/timberdale: simplify conditional

PATCH In review Nicolas Kaiser 3 participants 5 messages Oct 7, 2010 – Oct 8, 2010 dmaengine

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dma/timberdale: simplify conditional

Simplify: ((a && b) || (!a && !b)) => (a == b)

---
 drivers/dma/timb_dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/dma/timb_dma.c +1 -1
index 2ec1ed5..3b88a4e 100644
@@ -759,7 +759,7 @@ static int __devinit td_probe(struct platform_device *pdev)
 			pdata->channels + i;
 
 		/* even channels are RX, odd are TX */
-		if (((i % 2) && pchan->rx) || (!(i % 2) && !pchan->rx)) {
+		if ((i % 2) == pchan->rx) {
 			dev_err(&pdev->dev, "Wrong channel configuration\n");
 			err = -EINVAL;
 			goto err_tasklet_kill;
Signature · 1 line
1.7.2.2
#1 lore raw

We should be careful with this sort of transformation. It is only guaranteed true if both sides are boolean. E.g. ((foo & mask) && (bar & baz)) ¦¦ (!(foo & mask) && (!(bar & baz)) does not imply (foo & mask) == (bar & baz)). foo & mask could equal 0x0100 for example but bar & baz could equal 0x0001. Both are true as logicals but they are not equal.

One safe way to make this patch would be to add !! in front of both halves.

Of course this is a moot point if pdes->rx is a boolean or a single bit but I don't have the source to hand to check this (% 2 is guaranteed to be 0 or 1 so it doesn't matter).

Sorry if this doesn't make sense. Let me know and I can try and rephrase.

Hope this helps,
Jack

Quoted 30 lines · Nicolas Kaiser

Simplify: ((a && b) || (!a && !b)) => (a == b)

---
 drivers/dma/timb_dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/dma/timb_dma.c +1 -1
index 2ec1ed5..3b88a4e 100644
@@ -759,7 +759,7 @@ static int __devinit td_probe(struct platform_device
 *pdev)
 			pdata->channels + i;
 
 		/* even channels are RX, odd are TX */
-               if (((i % 2) && pchan->rx) || (!(i % 2) && !pchan->rx)) {
+               if ((i % 2) == pchan->rx) {
 			dev_err(&pdev->dev, "Wrong channel configuration\n");
 			err = -EINVAL;

goto err_tasklet_kill;

Signature · 7 lines
1.7.2.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel"
in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
#2 lore raw

My sincere apologies for the previous mail and the HTML email. I am still trying to get used to a new mail client but it is no excuse.

Sorry,

Jack

#4 lore raw
In reply to Jack Stone

It's just not my day today.

I had a look on LXR and rx is defined as a bool so we're safe in this case but might be worth a comment or even !! to future proof it.

Sorry for all the noise, Jack

#3 lore raw

driver or calculation of load average wrong ?

In reply to Jack Stone

Hello All,

I have the following configuration:
- CentOS 5
- kernel 2.6.20.1
- My own driver in a kernel_thread:

		while ( 1 ){
			printk ( KERN_INFO "go sleep, %lu\n", jiffies );
			current -> state = TASK_UNINTERRUPTIBLE;
			schedule_timeout ( msecs_to_jiffies(4000) );
			printk ( KERN_INFO "wakeup, %lu\n", jiffies );
		}

Each time I load the driver, the load average in /proc/loadavg reached:

	$ cat /proc/loadavg
	0.99 0.62 0.26 1/47 2868
Without my driver:
	$ cat /proc/loadavg
	0.03 0.03 0.00 1/47 2867

I changed nr_active(void) in kernel/sched.c:
unsigned long nr_active(void)

{
        unsigned long i, running = 0, uninterruptible = 0;

        for_each_online_cpu(i) {
                running += cpu_rq(i)->nr_running;
                uninterruptible += cpu_rq(i)->nr_uninterruptible;
        }

        if (unlikely((long)uninterruptible < 0))
                uninterruptible = 0;
// original:     return running + uninterruptible;
        return running;
}

Driver loaded or not:

	$ cat /proc/loadavg
	0.03 0.03 0.00 1/47 2867

Any help or comments would be really great?

Best regards, thanks, Frank

WINCOR NIXDORF International GmbH
Sitz der Gesellschaft: Paderborn
Registergericht Paderborn HRB 3507
Geschäftsführer: Eckard Heidloff (Vorsitzender), Stefan Auerbach, Dr. Jürgen Wunram Vorsitzender des Aufsichtsrats: Karl-Heinz Stiller
Steuernummer: 339/5884/0020 - Ust-ID Nr.: DE812927716 - WEEE-Reg.-Nr. DE44477193

Diese E-Mail enthält vertrauliche Informationen.
Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtümlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese E-Mail. Das unerlaubte Kopieren sowie die unbefugte Weitergabe dieser E-Mail ist nicht gestattet.

This e-mail may contain confidential information.
If you are not the intended recipient (or have received this e-mail in error)
please notify the sender immediately and destroy this e-mail.
Any unauthorised copying, disclosure or distribution of the material in this e-mail is strictly forbidden.