diff mbox

Revert "[media] et8ek8: Export OF device ID as module aliases"

Message ID 20170608090156.2373326-1-arnd@arndb.de
State New
Headers show

Commit Message

Arnd Bergmann June 8, 2017, 9:01 a.m. UTC
This one got applied twice, causing a build error with clang:

drivers/media/i2c/et8ek8/et8ek8_driver.c:1499:1: error: redefinition of '__mod_of__et8ek8_of_table_device_table'

Fixes: 9ae05fd1e791 ("[media] et8ek8: Export OF device ID as module aliases")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/media/i2c/et8ek8/et8ek8_driver.c | 1 -
 1 file changed, 1 deletion(-)

-- 
2.9.0

Comments

Sakari Ailus June 8, 2017, 12:49 p.m. UTC | #1
On Thu, Jun 08, 2017 at 11:01:37AM +0200, Arnd Bergmann wrote:
> This one got applied twice, causing a build error with clang:

> 

> drivers/media/i2c/et8ek8/et8ek8_driver.c:1499:1: error: redefinition of '__mod_of__et8ek8_of_table_device_table'

> 

> Fixes: 9ae05fd1e791 ("[media] et8ek8: Export OF device ID as module aliases")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>


-- 
Sakari Ailus
e-mail: sakari.ailus@iki.fi	XMPP: sailus@retiisi.org.uk
Stefan Agner Aug. 6, 2017, 11:29 p.m. UTC | #2
Hi Mauro,

Just hit this issue too. This seems not to have made it into v4.13 as of
today yet, any chance to get it still in?

--
Stefan

On 2017-06-08 02:01, Arnd Bergmann wrote:
> This one got applied twice, causing a build error with clang:

> 

> drivers/media/i2c/et8ek8/et8ek8_driver.c:1499:1: error: redefinition

> of '__mod_of__et8ek8_of_table_device_table'

> 

> Fixes: 9ae05fd1e791 ("[media] et8ek8: Export OF device ID as module aliases")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>

> Acked-by: Pavel Machek <pavel@ucw.cz>

> ---

>  drivers/media/i2c/et8ek8/et8ek8_driver.c | 1 -

>  1 file changed, 1 deletion(-)

> 

> diff --git a/drivers/media/i2c/et8ek8/et8ek8_driver.c

> b/drivers/media/i2c/et8ek8/et8ek8_driver.c

> index 6e313d5243a0..f39f5179dd95 100644

> --- a/drivers/media/i2c/et8ek8/et8ek8_driver.c

> +++ b/drivers/media/i2c/et8ek8/et8ek8_driver.c

> @@ -1496,7 +1496,6 @@ MODULE_DEVICE_TABLE(i2c, et8ek8_id_table);

>  static const struct dev_pm_ops et8ek8_pm_ops = {

>  	SET_SYSTEM_SLEEP_PM_OPS(et8ek8_suspend, et8ek8_resume)

>  };

> -MODULE_DEVICE_TABLE(of, et8ek8_of_table);

>  

>  static struct i2c_driver et8ek8_i2c_driver = {

>  	.driver		= {
Pavel Machek Aug. 7, 2017, 11:09 a.m. UTC | #3
Hi!

> Just hit this issue too. This seems not to have made it into v4.13 as of

> today yet, any chance to get it still in?


If Mauro does not react, I guess we can push the patche through
akpm. Hmm. Or directly to the Linus. -rc really is about fixing
regressions, such as this.

Best regards,
									Pavel

> --

> Stefan

> 

> On 2017-06-08 02:01, Arnd Bergmann wrote:

> > This one got applied twice, causing a build error with clang:

> > 

> > drivers/media/i2c/et8ek8/et8ek8_driver.c:1499:1: error: redefinition

> > of '__mod_of__et8ek8_of_table_device_table'

> > 

> > Fixes: 9ae05fd1e791 ("[media] et8ek8: Export OF device ID as module aliases")

> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> > Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>

> > Acked-by: Pavel Machek <pavel@ucw.cz>

> > ---

> >  drivers/media/i2c/et8ek8/et8ek8_driver.c | 1 -

> >  1 file changed, 1 deletion(-)

> > 

> > diff --git a/drivers/media/i2c/et8ek8/et8ek8_driver.c

> > b/drivers/media/i2c/et8ek8/et8ek8_driver.c

> > index 6e313d5243a0..f39f5179dd95 100644

> > --- a/drivers/media/i2c/et8ek8/et8ek8_driver.c

> > +++ b/drivers/media/i2c/et8ek8/et8ek8_driver.c

> > @@ -1496,7 +1496,6 @@ MODULE_DEVICE_TABLE(i2c, et8ek8_id_table);

> >  static const struct dev_pm_ops et8ek8_pm_ops = {

> >  	SET_SYSTEM_SLEEP_PM_OPS(et8ek8_suspend, et8ek8_resume)

> >  };

> > -MODULE_DEVICE_TABLE(of, et8ek8_of_table);

> >  

> >  static struct i2c_driver et8ek8_i2c_driver = {

> >  	.driver		= {


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
diff mbox

Patch

diff --git a/drivers/media/i2c/et8ek8/et8ek8_driver.c b/drivers/media/i2c/et8ek8/et8ek8_driver.c
index 6e313d5243a0..f39f5179dd95 100644
--- a/drivers/media/i2c/et8ek8/et8ek8_driver.c
+++ b/drivers/media/i2c/et8ek8/et8ek8_driver.c
@@ -1496,7 +1496,6 @@  MODULE_DEVICE_TABLE(i2c, et8ek8_id_table);
 static const struct dev_pm_ops et8ek8_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(et8ek8_suspend, et8ek8_resume)
 };
-MODULE_DEVICE_TABLE(of, et8ek8_of_table);
 
 static struct i2c_driver et8ek8_i2c_driver = {
 	.driver		= {