mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
213 lines
5.8 KiB
C
213 lines
5.8 KiB
C
/*
|
|
* m52790 i2c ivtv driver.
|
|
* Copyright (C) 2007 Hans Verkuil
|
|
*
|
|
* A/V source switching Mitsubishi M52790SP/FP
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/types.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/ioctl.h>
|
|
#include <asm/uaccess.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/i2c-id.h>
|
|
#include <linux/videodev2.h>
|
|
#include <media/m52790.h>
|
|
#include <media/v4l2-device.h>
|
|
#include <media/v4l2-chip-ident.h>
|
|
#include <media/v4l2-i2c-drv.h>
|
|
|
|
MODULE_DESCRIPTION("i2c device driver for m52790 A/V switch");
|
|
MODULE_AUTHOR("Hans Verkuil");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
struct m52790_state {
|
|
struct v4l2_subdev sd;
|
|
u16 input;
|
|
u16 output;
|
|
};
|
|
|
|
static inline struct m52790_state *to_state(struct v4l2_subdev *sd)
|
|
{
|
|
return container_of(sd, struct m52790_state, sd);
|
|
}
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
|
|
static int m52790_write(struct v4l2_subdev *sd)
|
|
{
|
|
struct m52790_state *state = to_state(sd);
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
u8 sw1 = (state->input | state->output) & 0xff;
|
|
u8 sw2 = (state->input | state->output) >> 8;
|
|
|
|
return i2c_smbus_write_byte_data(client, sw1, sw2);
|
|
}
|
|
|
|
/* Note: audio and video are linked and cannot be switched separately.
|
|
So audio and video routing commands are identical for this chip.
|
|
In theory the video amplifier and audio modes could be handled
|
|
separately for the output, but that seems to be overkill right now.
|
|
The same holds for implementing an audio mute control, this is now
|
|
part of the audio output routing. The normal case is that another
|
|
chip takes care of the actual muting so making it part of the
|
|
output routing seems to be the right thing to do for now. */
|
|
static int m52790_s_routing(struct v4l2_subdev *sd,
|
|
u32 input, u32 output, u32 config)
|
|
{
|
|
struct m52790_state *state = to_state(sd);
|
|
|
|
state->input = input;
|
|
state->output = output;
|
|
m52790_write(sd);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_VIDEO_ADV_DEBUG
|
|
static int m52790_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg)
|
|
{
|
|
struct m52790_state *state = to_state(sd);
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
if (!v4l2_chip_match_i2c_client(client, ®->match))
|
|
return -EINVAL;
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
return -EPERM;
|
|
if (reg->reg != 0)
|
|
return -EINVAL;
|
|
reg->size = 1;
|
|
reg->val = state->input | state->output;
|
|
return 0;
|
|
}
|
|
|
|
static int m52790_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg)
|
|
{
|
|
struct m52790_state *state = to_state(sd);
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
if (!v4l2_chip_match_i2c_client(client, ®->match))
|
|
return -EINVAL;
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
return -EPERM;
|
|
if (reg->reg != 0)
|
|
return -EINVAL;
|
|
state->input = reg->val & 0x0303;
|
|
state->output = reg->val & ~0x0303;
|
|
m52790_write(sd);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static int m52790_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)
|
|
{
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_M52790, 0);
|
|
}
|
|
|
|
static int m52790_log_status(struct v4l2_subdev *sd)
|
|
{
|
|
struct m52790_state *state = to_state(sd);
|
|
|
|
v4l2_info(sd, "Switch 1: %02x\n",
|
|
(state->input | state->output) & 0xff);
|
|
v4l2_info(sd, "Switch 2: %02x\n",
|
|
(state->input | state->output) >> 8);
|
|
return 0;
|
|
}
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
|
|
static const struct v4l2_subdev_core_ops m52790_core_ops = {
|
|
.log_status = m52790_log_status,
|
|
.g_chip_ident = m52790_g_chip_ident,
|
|
#ifdef CONFIG_VIDEO_ADV_DEBUG
|
|
.g_register = m52790_g_register,
|
|
.s_register = m52790_s_register,
|
|
#endif
|
|
};
|
|
|
|
static const struct v4l2_subdev_audio_ops m52790_audio_ops = {
|
|
.s_routing = m52790_s_routing,
|
|
};
|
|
|
|
static const struct v4l2_subdev_video_ops m52790_video_ops = {
|
|
.s_routing = m52790_s_routing,
|
|
};
|
|
|
|
static const struct v4l2_subdev_ops m52790_ops = {
|
|
.core = &m52790_core_ops,
|
|
.audio = &m52790_audio_ops,
|
|
.video = &m52790_video_ops,
|
|
};
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
|
|
/* i2c implementation */
|
|
|
|
static int m52790_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
struct m52790_state *state;
|
|
struct v4l2_subdev *sd;
|
|
|
|
/* Check if the adapter supports the needed features */
|
|
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
|
|
return -EIO;
|
|
|
|
v4l_info(client, "chip found @ 0x%x (%s)\n",
|
|
client->addr << 1, client->adapter->name);
|
|
|
|
state = kmalloc(sizeof(struct m52790_state), GFP_KERNEL);
|
|
if (state == NULL)
|
|
return -ENOMEM;
|
|
|
|
sd = &state->sd;
|
|
v4l2_i2c_subdev_init(sd, client, &m52790_ops);
|
|
state->input = M52790_IN_TUNER;
|
|
state->output = M52790_OUT_STEREO;
|
|
m52790_write(sd);
|
|
return 0;
|
|
}
|
|
|
|
static int m52790_remove(struct i2c_client *client)
|
|
{
|
|
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
|
|
|
v4l2_device_unregister_subdev(sd);
|
|
kfree(to_state(sd));
|
|
return 0;
|
|
}
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
|
|
static const struct i2c_device_id m52790_id[] = {
|
|
{ "m52790", 0 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, m52790_id);
|
|
|
|
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
|
|
.name = "m52790",
|
|
.probe = m52790_probe,
|
|
.remove = m52790_remove,
|
|
.id_table = m52790_id,
|
|
};
|