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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
ppc
/
keywest.c
diff --git
a/sound/ppc/keywest.c
b/sound/ppc/keywest.c
index
c490489
..
fb05938
100644
(file)
--- a/
sound/ppc/keywest.c
+++ b/
sound/ppc/keywest.c
@@
-23,7
+23,6
@@
#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/delay.h>
-#include <linux/i2c-dev.h>
#include <linux/slab.h>
#include <sound/core.h>
#include "pmac.h"
#include <linux/slab.h>
#include <sound/core.h>
#include "pmac.h"
@@
-32,7
+31,7
@@
* we have to keep a static variable here since i2c attach_adapter
* callback cannot pass a private data.
*/
* we have to keep a static variable here since i2c attach_adapter
* callback cannot pass a private data.
*/
-static
pmac_keywest_
t *keywest_ctx;
+static
struct pmac_keywes
t *keywest_ctx;
#define I2C_DRIVERID_KEYWEST 0xFEBA
#define I2C_DRIVERID_KEYWEST 0xFEBA
@@
-41,9
+40,10
@@
static int keywest_attach_adapter(struct i2c_adapter *adapter);
static int keywest_detach_client(struct i2c_client *client);
struct i2c_driver keywest_driver = {
static int keywest_detach_client(struct i2c_client *client);
struct i2c_driver keywest_driver = {
- .name = "PMac Keywest Audio",
+ .driver = {
+ .name = "PMac Keywest Audio",
+ },
.id = I2C_DRIVERID_KEYWEST,
.id = I2C_DRIVERID_KEYWEST,
- .flags = I2C_DF_NOTIFY,
.attach_adapter = &keywest_attach_adapter,
.detach_client = &keywest_detach_client,
};
.attach_adapter = &keywest_attach_adapter,
.detach_client = &keywest_detach_client,
};
@@
-76,8
+76,6
@@
static int keywest_attach_adapter(struct i2c_adapter *adapter)
new_client->flags = 0;
strcpy(i2c_device_name(new_client), keywest_ctx->name);
new_client->flags = 0;
strcpy(i2c_device_name(new_client), keywest_ctx->name);
-
- new_client->id = keywest_ctx->id++; /* Automatically unique */
keywest_ctx->client = new_client;
/* Tell the i2c layer a new client has arrived */
keywest_ctx->client = new_client;
/* Tell the i2c layer a new client has arrived */
@@
-108,7
+106,7
@@
static int keywest_detach_client(struct i2c_client *client)
}
/* exported */
}
/* exported */
-void snd_pmac_keywest_cleanup(
pmac_keywest_
t *i2c)
+void snd_pmac_keywest_cleanup(
struct pmac_keywes
t *i2c)
{
if (keywest_ctx && keywest_ctx == i2c) {
i2c_del_driver(&keywest_driver);
{
if (keywest_ctx && keywest_ctx == i2c) {
i2c_del_driver(&keywest_driver);
@@
-128,7
+126,7
@@
int __init snd_pmac_tumbler_post_init(void)
}
/* exported */
}
/* exported */
-int __init snd_pmac_keywest_init(
pmac_keywest_
t *i2c)
+int __init snd_pmac_keywest_init(
struct pmac_keywes
t *i2c)
{
int err;
{
int err;