git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
sparc64
/
kernel
/
auxio.c
diff --git
a/arch/sparc64/kernel/auxio.c
b/arch/sparc64/kernel/auxio.c
index
09a9749
..
a0716cc
100644
(file)
--- a/
arch/sparc64/kernel/auxio.c
+++ b/
arch/sparc64/kernel/auxio.c
@@
-17,7
+17,7
@@
#include <asm/auxio.h>
/* This cannot be static, as it is referenced in entry.S */
#include <asm/auxio.h>
/* This cannot be static, as it is referenced in entry.S */
-
unsigned long auxio_register = 0U
L;
+
void __iomem *auxio_register = NUL
L;
enum auxio_type {
AUXIO_TYPE_NODEV,
enum auxio_type {
AUXIO_TYPE_NODEV,
@@
-26,11
+26,11
@@
enum auxio_type {
};
static enum auxio_type auxio_devtype = AUXIO_TYPE_NODEV;
};
static enum auxio_type auxio_devtype = AUXIO_TYPE_NODEV;
-static
spinlock_t auxio_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(auxio_lock)
;
static void __auxio_sbus_set(u8 bits_on, u8 bits_off)
{
static void __auxio_sbus_set(u8 bits_on, u8 bits_off)
{
- if(auxio_register) {
+ if
(auxio_register) {
unsigned char regval;
unsigned long flags;
unsigned char newval;
unsigned char regval;
unsigned long flags;
unsigned char newval;
@@
-49,7
+49,7
@@
static void __auxio_sbus_set(u8 bits_on, u8 bits_off)
static void __auxio_ebus_set(u8 bits_on, u8 bits_off)
{
static void __auxio_ebus_set(u8 bits_on, u8 bits_off)
{
- if(auxio_register) {
+ if
(auxio_register) {
unsigned char regval;
unsigned long flags;
unsigned char newval;
unsigned char regval;
unsigned long flags;
unsigned char newval;
@@
-113,7
+113,7
@@
void auxio_set_lte(int on)
void __init auxio_probe(void)
{
struct sbus_bus *sbus;
void __init auxio_probe(void)
{
struct sbus_bus *sbus;
- struct sbus_dev *sdev =
0
;
+ struct sbus_dev *sdev =
NULL
;
for_each_sbus(sbus) {
for_each_sbusdev(sdev, sbus) {
for_each_sbus(sbus) {
for_each_sbusdev(sdev, sbus) {
@@
-126,12
+126,13
@@
found_sdev:
if (sdev) {
auxio_devtype = AUXIO_TYPE_SBUS;
auxio_register = sbus_ioremap(&sdev->resource[0], 0,
if (sdev) {
auxio_devtype = AUXIO_TYPE_SBUS;
auxio_register = sbus_ioremap(&sdev->resource[0], 0,
- sdev->reg_addrs[0].reg_size, "auxiliaryIO");
+ sdev->reg_addrs[0].reg_size,
+ "auxiliaryIO");
}
#ifdef CONFIG_PCI
else {
struct linux_ebus *ebus;
}
#ifdef CONFIG_PCI
else {
struct linux_ebus *ebus;
- struct linux_ebus_device *edev =
0
;
+ struct linux_ebus_device *edev =
NULL
;
for_each_ebus(ebus) {
for_each_ebusdev(edev, ebus) {
for_each_ebus(ebus) {
for_each_ebusdev(edev, ebus) {
@@
-142,7
+143,7
@@
found_sdev:
ebus_done:
if (edev) {
auxio_devtype = AUXIO_TYPE_EBUS;
ebus_done:
if (edev) {
auxio_devtype = AUXIO_TYPE_EBUS;
- auxio_register =
(unsigned long)
+ auxio_register =
ioremap(edev->resource[0].start, sizeof(u32));
}
}
ioremap(edev->resource[0].start, sizeof(u32));
}
}