ARM: s3c: Rename s3c64xx_spi_setname() function
Subsystems (3)
Krzysztof Kozlowski
maintainerPATCH 1/2 ARM: s3c: Rename s3c64xx_spi_setname() function
The name s3c64xx_spi_setname() suggests it is shared with S3C64xx platform, but except of contents it is not. It is called only by S3C24xx code, so make it clear in the name.
Signed-off-by Krzysztof Kozlowski <[email protected]>
--- arch/arm/mach-s3c24xx/s3c2416.c | 2 +- arch/arm/mach-s3c24xx/s3c2443.c | 2 +- arch/arm/mach-s3c24xx/spi-core.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-s3c24xx/s3c2416.c +1 -1
@@ -113,7 +113,7 @@ void __init s3c2416_map_io(void)/* initialize device information early */ s3c2416_default_sdhci0 ();s3c2416_default_sdhci1 (); -s3c64xx_spi_setname ("s3c2443-spi" ); +s3c24xx_spi_setname ("s3c2443-spi" );iotable_init (s3c2416_iodesc,ARRAY_SIZE (s3c2416_iodesc)); }
arch/arm/mach-s3c24xx/s3c2443.c +1 -1
@@ -91,7 +91,7 @@ void __init s3c2443_map_io(void) s3c24xx_gpiocfg_default.get_pull = s3c2443_gpio_getpull;/* initialize device information early */ -s3c64xx_spi_setname ("s3c2443-spi" ); +s3c24xx_spi_setname ("s3c2443-spi" );iotable_init (s3c2443_iodesc,ARRAY_SIZE (s3c2443_iodesc)); }
arch/arm/mach-s3c24xx/spi-core.h +1 -1
@@ -11,7 +11,7 @@*/ /* re-define device name depending on support. */ -static inline void s3c64xx_spi_setname (char *name) +static inline void s3c24xx_spi_setname (char *name) {#ifdef CONFIG_S3C64XX_DEV_SPI0 s3c64xx_device_spi0.name = name;
Signature · 1 line
2.17.1
Krzysztof Kozlowski
maintainerPATCH 2/2 ARM: s3c: Rename s5p_usb_phy functions
The name s5p_usb_phy_init() suggests it is shared with S5Pv210 platform, but it is not. It is specific to S3C64xx, so make it clear in the name.
Signed-off-by Krzysztof Kozlowski <[email protected]>
--- arch/arm/mach-s3c64xx/setup-usb-phy.c | 4 ++-- arch/arm/plat-samsung/devs.c | 4 ++-- arch/arm/plat-samsung/include/plat/usb-phy.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-s3c64xx/setup-usb-phy.c +2 -2
@@ -73,7 +73,7 @@ static int s3c_usb_otgphy_exit(struct platform_device *pdev)return 0 ; } -int s5p_usb_phy_init (struct platform_device *pdev,int type) +int s3c_usb_phy_init (struct platform_device *pdev,int type) {if (type ==USB_PHY_TYPE_DEVICE )return s3c_usb_otgphy_init (pdev);
@@ -81,7 +81,7 @@ int s5p_usb_phy_init(struct platform_device *pdev, int type)return -EINVAL ; } -int s5p_usb_phy_exit (struct platform_device *pdev,int type) +int s3c_usb_phy_exit (struct platform_device *pdev,int type) {if (type ==USB_PHY_TYPE_DEVICE )return s3c_usb_otgphy_exit (pdev);
arch/arm/plat-samsung/devs.c +2 -2
@@ -1010,9 +1010,9 @@ void __init dwc2_hsotg_set_platdata(struct dwc2_hsotg_plat *pd) npd =s3c_set_platdata (pd,sizeof (*npd), &s3c_device_usb_hsotg);if (!npd->phy_init) - npd->phy_init = s5p_usb_phy_init; + npd->phy_init = s3c_usb_phy_init;if (!npd->phy_exit) - npd->phy_exit = s5p_usb_phy_exit; + npd->phy_exit = s3c_usb_phy_exit; }#endif /* CONFIG_S3C_DEV_USB_HSOTG */
arch/arm/plat-samsung/include/plat/usb-phy.h +2 -2
@@ -7,7 +7,7 @@#ifndef __PLAT_SAMSUNG_USB_PHY_H#define __PLAT_SAMSUNG_USB_PHY_H __FILE__ -extern int s5p_usb_phy_init (struct platform_device *pdev,int type); -extern int s5p_usb_phy_exit (struct platform_device *pdev,int type); +extern int s3c_usb_phy_init (struct platform_device *pdev,int type); +extern int s3c_usb_phy_exit (struct platform_device *pdev,int type);#endif /* __PLAT_SAMSUNG_USB_PHY_H */
Signature · 1 line
2.17.1