mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 03:11:46 +00:00
auxdisplay for v6.13-1
* Move Holtek 16k33 driver to use agnostic i2c_get_match_data() * Miscellaneuous cleanups The following is an automated git shortlog grouped by driver: cfag12864b: - Remove unused functions ht16k33: - Make use of i2c_get_match_data() - Drop explicit initialization of struct i2c_device_id::driver_data to 0 lcd2s: - Drop explicit initialization of struct i2c_device_id::driver_data to 0 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEhiZOUlnC9oKN3n3AmT3/83c5Sy0FAmcrVb0ACgkQmT3/83c5 Sy2FQw/8D/237N73INQrDYBT6CF6vR6qoI7yms3OsOQV6f0WydHbG5dUqE+tXZ2g Axh1S4CKtJaO8PQjS+Tb1GFzzM/N9uIyFG8zQN520wU6CzW7ipvmqs3l2yREQzVz 4/ZrwVhUkDl0//x/Cd0PNGKhiIomszQVjc4TlHzJZXQtdx3Mkh/Xg8yo5QzYQRd5 JjcOW0s8GJd39+dT417oq/4LZE0mYvsEJQeU7RWf7EvkUy6GmWUiIoNOKBVkb6Sz U/PGdyux9sO9+6hH4ziJiaQRi+O9ZbLlNlL8VV++T35G+p1Y6lZGXTRduVQ1ElLz 98m1nrHNCKb6uvmtjDiA1Xlojf06cmpg+v2J+eD4aultIrHRiGgS4ZdRMJj5MoC7 +jyZBYPwNwDmOQAIPWqphVquXRkznvEqfKmfxtohDfsx0QBhdrEIJVtdIpUT1fqk 9a3vok/7TMJM65UE2Qo8omJoztjCf1YAPA5cHFpcr/i8Hl6GsHJP3ojTA8ryVDcQ MkxPI8AkEfOWqqa/amUN+mYh6sS8+rSKcVcKm/r1uV/ncH7CUAaxeWDSc8KT5IMX x/3n4+l8l+ZohAr17OVm+9rBl0KFtH1U3gXC+lkDuuvNmd7NbwBrUJWnop+zVwNb EEUqXU7y8Mljje3GCiUOn3M6FDzpVa4uVp9F7Ty/4Gnerjxj4Ns= =Z6SY -----END PGP SIGNATURE----- Merge tag 'auxdisplay-v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay 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:
commit
80db457e8d
@ -37,11 +37,6 @@ module_param(cfag12864b_rate, uint, 0444);
|
|||||||
MODULE_PARM_DESC(cfag12864b_rate,
|
MODULE_PARM_DESC(cfag12864b_rate,
|
||||||
"Refresh rate (hertz)");
|
"Refresh rate (hertz)");
|
||||||
|
|
||||||
unsigned int cfag12864b_getrate(void)
|
|
||||||
{
|
|
||||||
return cfag12864b_rate;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* cfag12864b Commands
|
* cfag12864b Commands
|
||||||
*
|
*
|
||||||
@ -249,11 +244,6 @@ void cfag12864b_disable(void)
|
|||||||
mutex_unlock(&cfag12864b_mutex);
|
mutex_unlock(&cfag12864b_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned char cfag12864b_isenabled(void)
|
|
||||||
{
|
|
||||||
return cfag12864b_updating;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cfag12864b_update(struct work_struct *work)
|
static void cfag12864b_update(struct work_struct *work)
|
||||||
{
|
{
|
||||||
unsigned char c;
|
unsigned char c;
|
||||||
@ -293,10 +283,8 @@ static void cfag12864b_update(struct work_struct *work)
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
EXPORT_SYMBOL_GPL(cfag12864b_buffer);
|
EXPORT_SYMBOL_GPL(cfag12864b_buffer);
|
||||||
EXPORT_SYMBOL_GPL(cfag12864b_getrate);
|
|
||||||
EXPORT_SYMBOL_GPL(cfag12864b_enable);
|
EXPORT_SYMBOL_GPL(cfag12864b_enable);
|
||||||
EXPORT_SYMBOL_GPL(cfag12864b_disable);
|
EXPORT_SYMBOL_GPL(cfag12864b_disable);
|
||||||
EXPORT_SYMBOL_GPL(cfag12864b_isenabled);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Is the module inited?
|
* Is the module inited?
|
||||||
|
@ -657,7 +657,6 @@ static int ht16k33_seg_probe(struct device *dev, struct ht16k33_priv *priv,
|
|||||||
static int ht16k33_probe(struct i2c_client *client)
|
static int ht16k33_probe(struct i2c_client *client)
|
||||||
{
|
{
|
||||||
struct device *dev = &client->dev;
|
struct device *dev = &client->dev;
|
||||||
const struct of_device_id *id;
|
|
||||||
struct ht16k33_priv *priv;
|
struct ht16k33_priv *priv;
|
||||||
uint32_t dft_brightness;
|
uint32_t dft_brightness;
|
||||||
int err;
|
int err;
|
||||||
@ -672,9 +671,8 @@ static int ht16k33_probe(struct i2c_client *client)
|
|||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
priv->client = client;
|
priv->client = client;
|
||||||
id = i2c_of_match_device(dev->driver->of_match_table, client);
|
priv->type = (uintptr_t)i2c_get_match_data(client);
|
||||||
if (id)
|
|
||||||
priv->type = (uintptr_t)id->data;
|
|
||||||
i2c_set_clientdata(client, priv);
|
i2c_set_clientdata(client, priv);
|
||||||
|
|
||||||
err = ht16k33_initialize(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[] = {
|
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);
|
MODULE_DEVICE_TABLE(i2c, ht16k33_i2c_match);
|
||||||
|
@ -349,7 +349,7 @@ static void lcd2s_i2c_remove(struct i2c_client *i2c)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static const struct i2c_device_id lcd2s_i2c_id[] = {
|
static const struct i2c_device_id lcd2s_i2c_id[] = {
|
||||||
{ "lcd2s", 0 },
|
{ "lcd2s" },
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(i2c, lcd2s_i2c_id);
|
MODULE_DEVICE_TABLE(i2c, lcd2s_i2c_id);
|
||||||
|
@ -27,13 +27,6 @@
|
|||||||
*/
|
*/
|
||||||
extern unsigned char * cfag12864b_buffer;
|
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
|
* Enable refreshing
|
||||||
*
|
*
|
||||||
@ -49,16 +42,6 @@ extern unsigned char cfag12864b_enable(void);
|
|||||||
*/
|
*/
|
||||||
extern void cfag12864b_disable(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?
|
* Is the module inited?
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user