linux.git/drivers/macintosh, branch v2.6.26-rc7

[POWERPC] Build fix for drivers/macintosh/mediabay.c

2008-06-16T05:00:47+00:00

This fixes the following build error with CONFIG_BLK_DEV_IDE_PMAC=n:

<--  snip  -->

...
  CC      drivers/macintosh/mediabay.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/macintosh/mediabay.c: In function 'check_media_bay':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/macintosh/mediabay.c:428: error: 'struct media_bay_info' has no member named 'cd_index'
make[3]: *** [drivers/macintosh/mediabay.o] Error 1

<--  snip  -->

Reported-by: Adrian Bunk 
Signed-off-by: Adrian Bunk 
Signed-off-by: Paul Mackerras

[POWERPC] Add missing of_node_put in drivers/macintosh/therm_adt746x.c

2008-06-16T05:00:39+00:00

of_node_put is needed before discarding a value received from
of_find_node_by_name, eg in error handling code.

The semantic patch that makes the change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// 
@@
struct device_node *n;
struct device_node *n1;
statement S;
identifier f;
expression E;
constant C;
@@

n = of_find_node_by_name(...)
...
if (!n) S
... when != of_node_put(n)
    when != n1 = f(n,...)
    when != E = n
    when any
    when strict
(
+ of_node_put(n);
  return -C;
|
  of_node_put(n);
|
  n1 = f(n,...)
|
  E = n
|
  return ...;
)
// 

Signed-off-by: Julia Lawall 
Acked-by: Stephen Rothwell 
Signed-off-by: Paul Mackerras

[POWERPC] Add missing of_node_put in drivers/macintosh/smu.c

2008-06-16T05:00:35+00:00

of_node_put is needed before discarding a value received from
of_find_node_by_type, eg in error handling code.

The semantic patch that makes the change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// 
@@
struct device_node *n;
struct device_node *n1;
struct device_node *n2;
statement S;
identifier f1,f2;
expression E1,E2;
constant C;
@@

n = of_find_node_by_type(...)
...
if (!n) S
... when != of_node_put(n)
    when != n1 = f1(n,...)
    when != E1 = n
    when any
    when strict
(
+ of_node_put(n);
  return -C;
|
  of_node_put(n);
|
  n2 = f2(n,...)
|
  E2 = n
|
  return ...;
)
// 

Signed-off-by: Julia Lawall 
Acked-by: Stephen Rothwell 
Signed-off-by: Paul Mackerras

ide-pmac: bugfix for media-bay support rework

2008-06-15T19:00:23+00:00

Fix bug introduced by:

commit 2dde7861afa23cd59db83515cb0b810b92b220aa
Author: Bartlomiej Zolnierkiewicz 
Date:   Fri Apr 18 00:46:23 2008 +0200

    ide: rework PowerMac media-bay support (take 2)
...

[ Yeah, I suck. ]

bay->cd_index shouldn't be changed if IDE devices are not present
or retry operations won't happen.

Cc: Benjamin Herrenschmidt 
Signed-off-by: Bartlomiej Zolnierkiewicz

[POWERPC] macintosh: Replace deprecated __initcall with device_initcall

2008-05-15T10:50:00+00:00

Signed-off-by: Robert P. J. Day 
Acked-by: Benjamin Herrenschmidt 
Signed-off-by: Andrew Morton 
Signed-off-by: Paul Mackerras

[POWERPC] macintosh: ADB driver: adb_handler_sem semaphore to mutex

2008-05-05T06:47:13+00:00

Signed-off-by: Daniel Walker 
Signed-off-by: Andrew Morton 
Acked-by: Benjamin Herrenschmidt 
Signed-off-by: Paul Mackerras

[POWERPC] macintosh: windfarm_smu_sat: semaphore to mutex

2008-05-05T06:47:13+00:00

Signed-off-by: Daniel Walker 
Signed-off-by: Andrew Morton 
Acked-by: Benjamin Herrenschmidt 
Signed-off-by: Paul Mackerras

[POWERPC] macintosh: therm_pm72: driver_lock semaphore to mutex

2008-05-05T06:47:13+00:00

Signed-off-by: Daniel Walker 
Signed-off-by: Andrew Morton 
Acked-by: Benjamin Herrenschmidt 
Signed-off-by: Paul Mackerras

[POWERPC] windfarm: Add PowerMac 12,1 support

2008-04-29T05:57:35+00:00

This implements a new driver named windfarm_pm121, which drives the
fans on PowerMac 12,1 machines : iMac G5 iSight (rev C) 17" and
20".  It's based on the windfarm_pm81 driver from Benjamin
Herrenschmidt.

This includes fixes from David Woodhouse correcting the names of some
of the sensors.

Signed-off-by: Étienne Bersac 
Signed-off-by: David Woodhouse 
Signed-off-by: Benjamin Herrenschmidt 
Signed-off-by: Paul Mackerras

mac-hid: fix build after lockdep annotation

2008-04-26T01:57:09+00:00

Signed-off-by: Harvey Harrison 
Signed-off-by: Linus Torvalds