2016-06-08 09:59:37 +00:00
|
|
|
From 97799edbda33efb8ebb20785bc7ad76c1b8a0aa9 Mon Sep 17 00:00:00 2001
|
2016-04-24 11:03:39 +00:00
|
|
|
From: Martin Sperl <kernel@martin.sperl.org>
|
|
|
|
Date: Mon, 29 Feb 2016 11:39:22 +0000
|
2016-06-08 09:59:37 +00:00
|
|
|
Subject: [PATCH 259/381] clk: bcm2835: clean up coding style issues
|
2016-04-24 11:03:39 +00:00
|
|
|
|
|
|
|
Fix all the checkpatch complaints for clk-bcm2835.c
|
|
|
|
|
|
|
|
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
|
|
(cherry picked from commit 6e1e60dacee7b32aef1468ea461b02e4c7a90a45)
|
|
|
|
---
|
|
|
|
drivers/clk/bcm/clk-bcm2835.c | 8 ++------
|
|
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
|
|
|
|
--- a/drivers/clk/bcm/clk-bcm2835.c
|
|
|
|
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
|
|
|
@@ -12,9 +12,6 @@
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
- * You should have received a copy of the GNU General Public License
|
|
|
|
- * along with this program; if not, write to the Free Software
|
|
|
|
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
@@ -299,7 +296,7 @@
|
|
|
|
struct bcm2835_cprman {
|
|
|
|
struct device *dev;
|
|
|
|
void __iomem *regs;
|
|
|
|
- spinlock_t regs_lock;
|
|
|
|
+ spinlock_t regs_lock; /* spinlock for all clocks */
|
|
|
|
const char *osc_name;
|
|
|
|
|
|
|
|
struct clk_onecell_data onecell;
|
2016-06-12 09:49:46 +00:00
|
|
|
@@ -1344,7 +1341,7 @@ static int bcm2835_clock_set_rate(struct
|
2016-04-24 11:03:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm2835_clock_determine_rate(struct clk_hw *hw,
|
|
|
|
- struct clk_rate_request *req)
|
|
|
|
+ struct clk_rate_request *req)
|
|
|
|
{
|
|
|
|
struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
|
|
|
|
struct clk_hw *parent, *best_parent = NULL;
|
2016-06-12 09:49:46 +00:00
|
|
|
@@ -1402,7 +1399,6 @@ static u8 bcm2835_clock_get_parent(struc
|
2016-04-24 11:03:39 +00:00
|
|
|
return (src & CM_SRC_MASK) >> CM_SRC_SHIFT;
|
|
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
static const struct clk_ops bcm2835_clock_clk_ops = {
|
|
|
|
.is_prepared = bcm2835_clock_is_on,
|
|
|
|
.prepare = bcm2835_clock_on,
|