From: "Frank Schäfer" <fschaefer.oss@googlemail.com>
To: mchehab@redhat.com
Cc: linux-media@vger.kernel.org,
"Frank Schäfer" <fschaefer.oss@googlemail.com>
Subject: [PATCH 4/7] em28xx: remove unused parameter ir_raw from i2c RC key polling functions
Date: Sun, 13 Jan 2013 15:20:42 +0100 [thread overview]
Message-ID: <1358086845-6989-4-git-send-email-fschaefer.oss@googlemail.com> (raw)
In-Reply-To: <1358086845-6989-1-git-send-email-fschaefer.oss@googlemail.com>
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
---
drivers/media/usb/em28xx/em28xx-input.c | 20 +++++++-------------
1 Datei geändert, 7 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-)
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
index a8f3636..e49d290 100644
--- a/drivers/media/usb/em28xx/em28xx-input.c
+++ b/drivers/media/usb/em28xx/em28xx-input.c
@@ -72,7 +72,7 @@ struct em28xx_IR {
/* external device (if used) */
struct i2c_client *i2c_dev;
- int (*get_key_i2c)(struct i2c_client *, u32 *, u32 *);
+ int (*get_key_i2c)(struct i2c_client *, u32 *);
int (*get_key)(struct em28xx_IR *, struct em28xx_ir_poll_result *);
};
@@ -80,8 +80,7 @@ struct em28xx_IR {
I2C IR based get keycodes - should be used with ir-kbd-i2c
**********************************************************/
-static int em28xx_get_key_terratec(struct i2c_client *i2c_dev,
- u32 *ir_key, u32 *ir_raw)
+static int em28xx_get_key_terratec(struct i2c_client *i2c_dev, u32 *ir_key)
{
unsigned char b;
@@ -101,12 +100,10 @@ static int em28xx_get_key_terratec(struct i2c_client *i2c_dev,
return 1;
*ir_key = b;
- *ir_raw = b;
return 1;
}
-static int em28xx_get_key_em_haup(struct i2c_client *i2c_dev,
- u32 *ir_key, u32 *ir_raw)
+static int em28xx_get_key_em_haup(struct i2c_client *i2c_dev, u32 *ir_key)
{
unsigned char buf[2];
u16 code;
@@ -146,12 +143,11 @@ static int em28xx_get_key_em_haup(struct i2c_client *i2c_dev,
/* return key */
*ir_key = code;
- *ir_raw = code;
return 1;
}
static int em28xx_get_key_pinnacle_usb_grey(struct i2c_client *i2c_dev,
- u32 *ir_key, u32 *ir_raw)
+ u32 *ir_key)
{
unsigned char buf[3];
@@ -164,13 +160,12 @@ static int em28xx_get_key_pinnacle_usb_grey(struct i2c_client *i2c_dev,
return 0;
*ir_key = buf[2]&0x3f;
- *ir_raw = buf[2]&0x3f;
return 1;
}
static int em28xx_get_key_winfast_usbii_deluxe(struct i2c_client *i2c_dev,
- u32 *ir_key, u32 *ir_raw)
+ u32 *ir_key)
{
unsigned char subaddr, keydetect, key;
@@ -192,7 +187,6 @@ static int em28xx_get_key_winfast_usbii_deluxe(struct i2c_client *i2c_dev,
return 0;
*ir_key = key;
- *ir_raw = key;
return 1;
}
@@ -288,10 +282,10 @@ static int em2874_polling_getkey(struct em28xx_IR *ir,
static int em28xx_i2c_ir_handle_key(struct em28xx_IR *ir)
{
- static u32 ir_key, ir_raw;
+ static u32 ir_key;
int rc;
- rc = ir->get_key_i2c(ir->i2c_dev, &ir_key, &ir_raw);
+ rc = ir->get_key_i2c(ir->i2c_dev, &ir_key);
if (rc < 0) {
dprintk("ir->get_key_i2c() failed: %d\n", rc);
return rc;
--
1.7.10.4
next prev parent reply other threads:[~2013-01-13 14:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-13 14:20 [PATCH 1/7] em28xx-input: remove dead code line from em28xx_get_key_em_haup() Frank Schäfer
2013-01-13 14:20 ` [PATCH 2/7] em28xx: remove i2cdprintk() messages Frank Schäfer
2013-01-13 14:20 ` [PATCH 3/7] em28xx: get rid of the dependency on module ir-kbd-i2c Frank Schäfer
2013-01-13 14:20 ` Frank Schäfer [this message]
2013-01-13 14:20 ` [PATCH 5/7] em28xx: fix a comment and a small coding style issue Frank Schäfer
2013-01-13 14:20 ` [PATCH 6/7] em28xx: i2c RC devices: minor code size and memory usage optimization Frank Schäfer
2013-01-13 14:20 ` [PATCH 7/7] em28xx: input: use common work_struct callback function for IR RC key polling Frank Schäfer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358086845-6989-4-git-send-email-fschaefer.oss@googlemail.com \
--to=fschaefer.oss@googlemail.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).