Merge tag 'hwlock-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc (0e10f9c8) · Commits · 戴 / test

drivers/hwspinlock/sirf_hwspinlock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ static struct platform_driver sirf_hwspinlock_driver = {
		.probe = sirf_hwspinlock_probe,
		.driver = {
		.name = "atlas7_hwspinlock",
		.of_match_table = of_match_ptr(sirf_hwpinlock_ids),
		.of_match_table = sirf_hwpinlock_ids,
		},
		};

+2 −15

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@
		* Copyright (C) 2017 Spreadtrum - http://www.spreadtrum.com
		*/

		#include <linux/bitops.h>
		#include <linux/clk.h>
		#include <linux/delay.h>
		#include <linux/device.h>
		@@ -15,7 +14,6 @@
		#include <linux/of.h>
		#include <linux/of_device.h>
		#include <linux/platform_device.h>
		#include <linux/slab.h>

		#include "hwspinlock_internal.h"

		@@ -148,21 +146,10 @@ static struct platform_driver sprd_hwspinlock_driver = {
		.probe = sprd_hwspinlock_probe,
		.driver = {
		.name = "sprd_hwspinlock",
		.of_match_table = of_match_ptr(sprd_hwspinlock_of_match),
		.of_match_table = sprd_hwspinlock_of_match,
		},
		};

		static int __init sprd_hwspinlock_init(void)
		{
		return platform_driver_register(&sprd_hwspinlock_driver);
		}
		postcore_initcall(sprd_hwspinlock_init);

		static void __exit sprd_hwspinlock_exit(void)
		{
		platform_driver_unregister(&sprd_hwspinlock_driver);
		}
		module_exit(sprd_hwspinlock_exit);
		module_platform_driver(sprd_hwspinlock_driver);

		MODULE_LICENSE("GPL v2");
		MODULE_DESCRIPTION("Hardware spinlock driver for Spreadtrum");