Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1bebd07 authored by Helge Deller's avatar Helge Deller
Browse files

parisc/serio: Fix section mismatches in gscps2 and hp_sdc drivers 



Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent cfe4fbfb

drivers/input/serio/gscps2.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -325,7 +325,7 @@ static void gscps2_close(struct serio *port) 
 * @return: success/error report

 * @return: success/error report

 */

 */





static int gscps2_probe(struct parisc_device *dev)

static int __init gscps2_probe(struct parisc_device *dev)

{

{

	struct gscps2port *ps2port;

	struct gscps2port *ps2port;

	struct serio *serio;

	struct serio *serio;
@@ -412,7 +412,7 @@ static int gscps2_probe(struct parisc_device *dev) 
 * @return: success/error report

 * @return: success/error report

 */

 */





static int gscps2_remove(struct parisc_device *dev)

static int __exit gscps2_remove(struct parisc_device *dev)

{

{

	struct gscps2port *ps2port = dev_get_drvdata(&dev->dev);

	struct gscps2port *ps2port = dev_get_drvdata(&dev->dev);
@@ -430,7 +430,7 @@ static int gscps2_remove(struct parisc_device *dev) 
}

}









static struct parisc_device_id gscps2_device_tbl[] = {

static const struct parisc_device_id gscps2_device_tbl[] __initconst = {

	{ HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00084 }, /* LASI PS/2 */

	{ HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00084 }, /* LASI PS/2 */

#ifdef DINO_TESTED

#ifdef DINO_TESTED

	{ HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00096 }, /* DINO PS/2 */

	{ HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00096 }, /* DINO PS/2 */
@@ -439,11 +439,11 @@ static struct parisc_device_id gscps2_device_tbl[] = { 
};

};

MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl);

MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl);





static struct parisc_driver parisc_ps2_driver = {

static struct parisc_driver parisc_ps2_driver __refdata = {

	.name		= "gsc_ps2",

	.name		= "gsc_ps2",

	.id_table	= gscps2_device_tbl,

	.id_table	= gscps2_device_tbl,

	.probe		= gscps2_probe,

	.probe		= gscps2_probe,

	.remove		= gscps2_remove,

	.remove		= __exit_p(gscps2_remove),

};

};





static int __init gscps2_init(void)

static int __init gscps2_init(void)

drivers/input/serio/hp_sdc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -805,7 +805,7 @@ static void hp_sdc_kicker(unsigned long data) 




#if defined(__hppa__)

#if defined(__hppa__)





static const struct parisc_device_id hp_sdc_tbl[] = {

static const struct parisc_device_id hp_sdc_tbl[] __initconst = {

	{

	{

		.hw_type =	HPHW_FIO,

		.hw_type =	HPHW_FIO,

		.hversion_rev =	HVERSION_REV_ANY_ID,

		.hversion_rev =	HVERSION_REV_ANY_ID,
@@ -820,7 +820,7 @@ MODULE_DEVICE_TABLE(parisc, hp_sdc_tbl); 
static int __init hp_sdc_init_hppa(struct parisc_device *d);

static int __init hp_sdc_init_hppa(struct parisc_device *d);

static struct delayed_work moduleloader_work;

static struct delayed_work moduleloader_work;





static struct parisc_driver hp_sdc_driver = {

static struct parisc_driver hp_sdc_driver __refdata = {

	.name =		"hp_sdc",

	.name =		"hp_sdc",

	.id_table =	hp_sdc_tbl,

	.id_table =	hp_sdc_tbl,

	.probe =	hp_sdc_init_hppa,

	.probe =	hp_sdc_init_hppa,