dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'auxdisplay-v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay

Browse Source 
Pull auxdisplay update from Andy Shevchenko:

 - Move Holtek 16k33 driver to use agnostic i2c_get_match_data()

 - Miscellaneuous cleanups

* tag 'auxdisplay-v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay:
  auxdisplay: Remove unused functions
  auxdisplay: ht16k33: Make use of i2c_get_match_data()
  auxdisplay: Drop explicit initialization of struct i2c_device_id::driver_data to 0
This commit is contained in:
Linus Torvalds
2024-11-20 12:55:41 -08:00
parent 38556294b8 0b028ff7e7
commit 80db457e8d
4 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/auxdisplay/cfag12864b.c
-12
View File
@@ -37,11 +37,6 @@ module_param(cfag12864b_rate, uint, 0444);
MODULE_PARM_DESC(cfag12864b_rate,
"Refresh rate (hertz)");
unsigned int cfag12864b_getrate(void)
{
return cfag12864b_rate;
}
/*
* cfag12864b Commands
*
@@ -249,11 +244,6 @@ void cfag12864b_disable(void)
mutex_unlock(&cfag12864b_mutex);
}
unsigned char cfag12864b_isenabled(void)
{
return cfag12864b_updating;
}
static void cfag12864b_update(struct work_struct *work)
{
unsigned char c;
@@ -293,10 +283,8 @@ static void cfag12864b_update(struct work_struct *work)
*/
EXPORT_SYMBOL_GPL(cfag12864b_buffer);
EXPORT_SYMBOL_GPL(cfag12864b_getrate);
EXPORT_SYMBOL_GPL(cfag12864b_enable);
EXPORT_SYMBOL_GPL(cfag12864b_disable);
EXPORT_SYMBOL_GPL(cfag12864b_isenabled);
/*
* Is the module inited?
drivers/auxdisplay/ht16k33.c
+5 -5
View File
@@ -657,7 +657,6 @@ static int ht16k33_seg_probe(struct device *dev, struct ht16k33_priv *priv,
static int ht16k33_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
const struct of_device_id *id;
struct ht16k33_priv *priv;
uint32_t dft_brightness;
int err;
@@ -672,9 +671,8 @@ static int ht16k33_probe(struct i2c_client *client)
return -ENOMEM;
priv->client = client;
id = i2c_of_match_device(dev->driver->of_match_table, client);
if (id)
priv->type = (uintptr_t)id->data;
priv->type = (uintptr_t)i2c_get_match_data(client);
i2c_set_clientdata(client, priv);
err = ht16k33_initialize(priv);
@@ -747,7 +745,9 @@ static void ht16k33_remove(struct i2c_client *client)
}
static const struct i2c_device_id ht16k33_i2c_match[] = {
{ "ht16k33", 0 },
{ "3108", DISP_QUAD_7SEG },
{ "3130", DISP_QUAD_14SEG },
{ "ht16k33", DISP_MATRIX },
{ }
};
MODULE_DEVICE_TABLE(i2c, ht16k33_i2c_match);
drivers/auxdisplay/lcd2s.c
+1 -1
View File
@@ -349,7 +349,7 @@ static void lcd2s_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id lcd2s_i2c_id[] = {
{ "lcd2s", 0 },
{ "lcd2s" },
{ }
};
MODULE_DEVICE_TABLE(i2c, lcd2s_i2c_id);
include/linux/cfag12864b.h
-17
View File
@@ -27,13 +27,6 @@
*/
extern unsigned char * cfag12864b_buffer;
/*
* Get the refresh rate of the LCD
*
* Returns the refresh rate (hertz).
*/
extern unsigned int cfag12864b_getrate(void);
/*
* Enable refreshing
*
@@ -49,16 +42,6 @@ extern unsigned char cfag12864b_enable(void);
*/
extern void cfag12864b_disable(void);
/*
* Is enabled refreshing? (is anyone using the module?)
*
* Returns 0 if refreshing is not enabled (anyone is using it),
* or != 0 if refreshing is enabled (someone is using it).
*
* Useful for buffer read-only modules.
*/
extern unsigned char cfag12864b_isenabled(void);
/*
* Is the module inited?
*/