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

Commit 3041b6ab authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

[S390] css_bus_type: make it static 



Make css_bus_type static. Subchannel drivers have to
use css_driver_register.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent e6aed122

drivers/s390/cio/css.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ int css_init_done = 0; 
int max_ssid;

int max_ssid;





struct channel_subsystem *channel_subsystems[__MAX_CSSID + 1];

struct channel_subsystem *channel_subsystems[__MAX_CSSID + 1];

static struct bus_type css_bus_type;





int

int

for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *data)

for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *data)
@@ -1214,7 +1215,7 @@ static const struct dev_pm_ops css_pm_ops = { 
	.restore = css_pm_restore,

	.restore = css_pm_restore,

};

};





struct bus_type css_bus_type = {

static struct bus_type css_bus_type = {

	.name     = "css",

	.name     = "css",

	.match    = css_bus_match,

	.match    = css_bus_match,

	.probe    = css_probe,

	.probe    = css_probe,
@@ -1251,4 +1252,3 @@ void css_driver_unregister(struct css_driver *cdrv) 
EXPORT_SYMBOL_GPL(css_driver_unregister);

EXPORT_SYMBOL_GPL(css_driver_unregister);





MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL");
 
EXPORT_SYMBOL(css_bus_type);

drivers/s390/cio/css.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -97,11 +97,6 @@ struct css_driver { 




#define to_cssdriver(n) container_of(n, struct css_driver, drv)

#define to_cssdriver(n) container_of(n, struct css_driver, drv)





/*

 * all css_drivers have the css_bus_type

 */

extern struct bus_type css_bus_type;



extern int css_driver_register(struct css_driver *);

extern int css_driver_register(struct css_driver *);

extern void css_driver_unregister(struct css_driver *);

extern void css_driver_unregister(struct css_driver *);
@@ -136,7 +131,6 @@ struct channel_subsystem { 
};

};

#define to_css(dev) container_of(dev, struct channel_subsystem, device)

#define to_css(dev) container_of(dev, struct channel_subsystem, device)





extern struct bus_type css_bus_type;

extern struct channel_subsystem *channel_subsystems[];

extern struct channel_subsystem *channel_subsystems[];





/* Helper functions to build lists for the slow path. */

/* Helper functions to build lists for the slow path. */