Revision 804d2312309aaf8b80a09038cf12333f0cb4f32c authored by Paul Gortmaker on 30 March 2012, 00:41:02 UTC, committed by Haojian Zhuang on 30 March 2012, 00:41:18 UTC
Commit 737f360d5bef5e01c6cfa755dca0b449a154c1e0 "regulator: Remove support for supplies specified by struct device" caused this file to break, since it was still relying on the device field to be present. Map it onto dev_name appropriately Since there are two consumers with the name "reg-userspace-consumer", we have to supply the ID as a suffix in the REGULATOR_CONSUMER calls. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> CC: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
1 parent 3a56913
endian.h
/*
* linux/fs/befs/endian.h
*
* Copyright (C) 2001 Will Dyson <will_dyson@pobox.com>
*
* Partially based on similar funtions in the sysv driver.
*/
#ifndef LINUX_BEFS_ENDIAN
#define LINUX_BEFS_ENDIAN
#include <asm/byteorder.h>
static inline u64
fs64_to_cpu(const struct super_block *sb, fs64 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return le64_to_cpu((__force __le64)n);
else
return be64_to_cpu((__force __be64)n);
}
static inline fs64
cpu_to_fs64(const struct super_block *sb, u64 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return (__force fs64)cpu_to_le64(n);
else
return (__force fs64)cpu_to_be64(n);
}
static inline u32
fs32_to_cpu(const struct super_block *sb, fs32 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return le32_to_cpu((__force __le32)n);
else
return be32_to_cpu((__force __be32)n);
}
static inline fs32
cpu_to_fs32(const struct super_block *sb, u32 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return (__force fs32)cpu_to_le32(n);
else
return (__force fs32)cpu_to_be32(n);
}
static inline u16
fs16_to_cpu(const struct super_block *sb, fs16 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return le16_to_cpu((__force __le16)n);
else
return be16_to_cpu((__force __be16)n);
}
static inline fs16
cpu_to_fs16(const struct super_block *sb, u16 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return (__force fs16)cpu_to_le16(n);
else
return (__force fs16)cpu_to_be16(n);
}
/* Composite types below here */
static inline befs_block_run
fsrun_to_cpu(const struct super_block *sb, befs_disk_block_run n)
{
befs_block_run run;
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE) {
run.allocation_group = le32_to_cpu((__force __le32)n.allocation_group);
run.start = le16_to_cpu((__force __le16)n.start);
run.len = le16_to_cpu((__force __le16)n.len);
} else {
run.allocation_group = be32_to_cpu((__force __be32)n.allocation_group);
run.start = be16_to_cpu((__force __be16)n.start);
run.len = be16_to_cpu((__force __be16)n.len);
}
return run;
}
static inline befs_disk_block_run
cpu_to_fsrun(const struct super_block *sb, befs_block_run n)
{
befs_disk_block_run run;
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE) {
run.allocation_group = cpu_to_le32(n.allocation_group);
run.start = cpu_to_le16(n.start);
run.len = cpu_to_le16(n.len);
} else {
run.allocation_group = cpu_to_be32(n.allocation_group);
run.start = cpu_to_be16(n.start);
run.len = cpu_to_be16(n.len);
}
return run;
}
static inline befs_data_stream
fsds_to_cpu(const struct super_block *sb, const befs_disk_data_stream *n)
{
befs_data_stream data;
int i;
for (i = 0; i < BEFS_NUM_DIRECT_BLOCKS; ++i)
data.direct[i] = fsrun_to_cpu(sb, n->direct[i]);
data.max_direct_range = fs64_to_cpu(sb, n->max_direct_range);
data.indirect = fsrun_to_cpu(sb, n->indirect);
data.max_indirect_range = fs64_to_cpu(sb, n->max_indirect_range);
data.double_indirect = fsrun_to_cpu(sb, n->double_indirect);
data.max_double_indirect_range = fs64_to_cpu(sb,
n->
max_double_indirect_range);
data.size = fs64_to_cpu(sb, n->size);
return data;
}
#endif //LINUX_BEFS_ENDIAN
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...