hc
2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d
kernel/drivers/i2c/busses/i2c-zx2967.c
....@@ -1,12 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Copyright (C) 2017 Sanechips Technology Co., Ltd.
34 * Copyright 2017 Linaro Ltd.
45 *
56 * Author: Baoyou Xie <baoyou.xie@linaro.org>
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License version 2 as
9
- * published by the Free Software Foundation.
107 */
118
129 #include <linux/clk.h>
....@@ -66,7 +63,6 @@
6663 int msg_rd;
6764 u8 *cur_trans;
6865 u8 access_cnt;
69
- bool is_suspended;
7066 int error;
7167 };
7268
....@@ -313,9 +309,6 @@
313309 int ret;
314310 int i;
315311
316
- if (i2c->is_suspended)
317
- return -EBUSY;
318
-
319312 zx2967_set_addr(i2c, msgs->addr);
320313
321314 for (i = 0; i < num; i++) {
....@@ -470,7 +463,7 @@
470463 {
471464 struct zx2967_i2c *i2c = dev_get_drvdata(dev);
472465
473
- i2c->is_suspended = true;
466
+ i2c_mark_adapter_suspended(&i2c->adap);
474467 clk_disable_unprepare(i2c->clk);
475468
476469 return 0;
....@@ -480,8 +473,8 @@
480473 {
481474 struct zx2967_i2c *i2c = dev_get_drvdata(dev);
482475
483
- i2c->is_suspended = false;
484476 clk_prepare_enable(i2c->clk);
477
+ i2c_mark_adapter_resumed(&i2c->adap);
485478
486479 return 0;
487480 }
....@@ -509,7 +502,6 @@
509502 {
510503 struct zx2967_i2c *i2c;
511504 void __iomem *reg_base;
512
- struct resource *res;
513505 struct clk *clk;
514506 int ret;
515507
....@@ -517,8 +509,7 @@
517509 if (!i2c)
518510 return -ENOMEM;
519511
520
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
521
- reg_base = devm_ioremap_resource(&pdev->dev, res);
512
+ reg_base = devm_platform_ioremap_resource(pdev, 0);
522513 if (IS_ERR(reg_base))
523514 return PTR_ERR(reg_base);
524515