mirror of
https://github.com/torvalds/linux
synced 2024-07-22 03:01:14 +00:00
Removed the SPD class of i2c devices from the device core.
Additionally, a cleanup in the Synquacer code removes the pclk from the global structure, as it is used only in the probe. Therefore, it is now declared locally. -----BEGIN PGP SIGNATURE----- iIwEABYIADQWIQScDfrjQa34uOld1VLaeAVmJtMtbgUCZk8txxYcYW5kaS5zaHl0 aUBrZXJuZWwub3JnAAoJENp4BWYm0y1uRIgBAOpkv9LBc1NsjUXM2UNA0L3zEXvF ZbCYV7cEIYMxt2AdAQD1Nsy1olg8Juq3H8A6buC3hYkJJA0IY3EKS6ttnNsQDw== =S5ew -----END PGP SIGNATURE----- Merge tag 'i2c-host-6.10-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current Removed the SPD class of i2c devices from the device core. Additionally, a cleanup in the Synquacer code removes the pclk from the global structure, as it is used only in the probe. Therefore, it is now declared locally.
This commit is contained in:
commit
c4aff1d1ec
|
@ -138,7 +138,6 @@ struct synquacer_i2c {
|
|||
int irq;
|
||||
struct device *dev;
|
||||
void __iomem *base;
|
||||
struct clk *pclk;
|
||||
u32 pclkrate;
|
||||
u32 speed_khz;
|
||||
u32 timeout_ms;
|
||||
|
@ -535,6 +534,7 @@ static const struct i2c_adapter synquacer_i2c_ops = {
|
|||
static int synquacer_i2c_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct synquacer_i2c *i2c;
|
||||
struct clk *pclk;
|
||||
u32 bus_speed;
|
||||
int ret;
|
||||
|
||||
|
@ -550,13 +550,12 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
|
|||
device_property_read_u32(&pdev->dev, "socionext,pclk-rate",
|
||||
&i2c->pclkrate);
|
||||
|
||||
i2c->pclk = devm_clk_get_enabled(&pdev->dev, "pclk");
|
||||
if (IS_ERR(i2c->pclk))
|
||||
return dev_err_probe(&pdev->dev, PTR_ERR(i2c->pclk),
|
||||
pclk = devm_clk_get_enabled(&pdev->dev, "pclk");
|
||||
if (IS_ERR(pclk))
|
||||
return dev_err_probe(&pdev->dev, PTR_ERR(pclk),
|
||||
"failed to get and enable clock\n");
|
||||
|
||||
dev_dbg(&pdev->dev, "clock source %p\n", i2c->pclk);
|
||||
i2c->pclkrate = clk_get_rate(i2c->pclk);
|
||||
i2c->pclkrate = clk_get_rate(pclk);
|
||||
|
||||
if (i2c->pclkrate < SYNQUACER_I2C_MIN_CLK_RATE ||
|
||||
i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE)
|
||||
|
|
|
@ -852,7 +852,6 @@ static inline void i2c_mark_adapter_resumed(struct i2c_adapter *adap)
|
|||
|
||||
/* i2c adapter classes (bitmask) */
|
||||
#define I2C_CLASS_HWMON (1<<0) /* lm_sensors, ... */
|
||||
#define I2C_CLASS_SPD (1<<7) /* Memory modules */
|
||||
/* Warn users that the adapter doesn't support classes anymore */
|
||||
#define I2C_CLASS_DEPRECATED (1<<8)
|
||||
|
||||
|
|
Loading…
Reference in a new issue